# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1451042231 -32400
# Node ID 093bbd028ee3778b90edbd6de27afadb3f6b2e80
# Parent  874cc70386f98b989dca422e428b92c706c2695a# Parent  ecf70fb215a5649f091c46bd432e661b81031608
merge  branch