# HG changeset patch # User Katsumi Yamaoka # Date 1271632481 0 # Node ID d7b6f0f1d15024f99e332a45c7719733d672a6cd # Parent e62a3bc4cbefcbbe8b78a0f360e92974194882a1# Parent 23736de7090292b79ea647f59a6086d20da9c52d Merge from mainline.