# HG changeset patch # User Katsumi Yamaoka # Date 1270677108 0 # Node ID 34782d196992a77729214529503c97894726cc77 # Parent 5a53cd4938e375a16b9a97d8858c2daff8dbad2a# Parent d1704f1bb946bef08dbd152c642835d62e930bfa Merge from mainline.