# HG changeset patch
# User Yu Taninari <e085734@ie.u-ryukyu.ac.jp>
# Date 1314777548 -32400
# Node ID 484fc6e38af7e89d558c175a79893fc11d2de0fe
# Parent  407343700cccd1e27116336b6e24f9f26ac14c64# Parent  001f0b770f963fa6c6678ba2195a2f6ed4e3445b
merge