merge
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 23 Dec 2013 08:55:46 +0000 (17:55 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 23 Dec 2013 08:55:46 +0000 (17:55 +0900)

Trivial merge