Merge branch 'master' of www.gniibe.org:git/gnuk
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 28 May 2012 00:42:24 +0000 (09:42 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 28 May 2012 00:42:24 +0000 (09:42 +0900)

Trivial merge