# HG changeset patch # User Katsumi Yamaoka # Date 1269921646 0 # Node ID df4f6d6be3b36e40df67f1d8d7e0fb2c2c2117e5 # Parent 54562a7c10fbf8ff3a6137cc746636583235ab95# Parent dbd787c249c5494c6912b98b6120617ae5683b95 Merge from mainline.