# HG changeset patch # User Katsumi Yamaoka # Date 1273558366 0 # Node ID a5ca1d2d9889a76eec1875f62a180cc5e9045d90 # Parent 6232c848b863847ab2869508c1b791fc6ba9fac4# Parent 0eeae12a33a9e479e9cfcf68ea365a652a302b27 Merge from mainline.