# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1267761096 -32400
# Node ID 558c6c856f8926ba33af7a28948325a2fa0c7e7d
# Parent  c38799cc3f60bdf25c09da8a01e375379cec5208# Parent  6074168273ded96d638c67af20de2f48fe057dce
merge