# HG changeset patch # User Katsumi Yamaoka # Date 1270018425 0 # Node ID 618b73d33723bb0a602ad793e1376cf755763803 # Parent 17652da750fc7640d324deacebef5518f7401a02# Parent 7e3e614f8fe135c72eb2cef50da17cc2dd6bcb25 Merge from mainline.