# HG changeset patch # User Katsumi Yamaoka # Date 1283237869 0 # Node ID 872e600cef62310dbf5c502f5c209fb36e3a7f03 # Parent 07b5be82cf7ae07f40cc092f98850c48c90ec8e4# Parent b0de94d21a73e9724b9e773bcac40e003e2a540a Merge from mainline.