# HG changeset patch # User Katsumi Yamaoka # Date 1268603801 0 # Node ID a61767ff66723d1fa5f985d439859841c29c0f58 # Parent 018bc2f5c9e69b19f7194107f634375cdbfcf348# Parent 78dd74750b2b16e27069b1583f844e9b0e0ab6a2 Merge from mainline.