merge
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 18 Apr 2011 13:20:41 +0000 (22:20 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 18 Apr 2011 13:20:41 +0000 (22:20 +0900)

Trivial merge