# HG changeset patch # User Katsumi Yamaoka # Date 1263106489 0 # Node ID e36c1160a378a6f68c129d36fb755da4122533d2 # Parent 1790c59702ec1b386fb6893309edf3db94c8a382# Parent a32698d5bb0c5db7fe3693734690af3d934477fc Merge from mainline.