# HG changeset patch # User Katsumi Yamaoka # Date 1275437788 0 # Node ID bffeeada2cff0a969387dbcbf963dc3b1524f875 # Parent 8661a29f61317ee2e22c554aef5db083b2f9a2ad# Parent b31557c10743e66c4342250e12439e694e4edbdf Merge from mainline.