# HG changeset patch
# User KAMADA Kei <c110206@f.koeki-u.ac.jp>
# Date 1371304971 -32400
# Node ID 1270069e004e0ca799fa971117ce1caa30fb47c1
# Parent  193310683184acd1f2e73d9f440996bec616a907# Parent  c1019a0f93ce57bc4b60bce7973a8629fc3d9627
merge