# HG changeset patch
# User Yutaka_Kinjyo
# Date 1289887168 -32400
# Node ID 8892d0ea7985edeccf67df977c5ba3ebf71558af
# Parent  7fafe412c28fa0800aeba247c54008d6754ec298# Parent  cda812a1a66b01b2f5358b7aa33403e8980f0d73
merge