From: Atsushi Konno <konn@users.sourceforge.jp>
Date: Sun, 27 Feb 2011 12:30:15 +0000 (+0900)
Subject: Merge branch 'branch_0.12.0-tmp' into branch_0.12.0
X-Git-Tag: v0.12.38~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9767137103778a3af25c4f90e509dcc9ab3cf93;p=modchxj%2Fmod_chxj.git

Merge branch 'branch_0.12.0-tmp' into branch_0.12.0
---

e9767137103778a3af25c4f90e509dcc9ab3cf93