Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 29 Nov 2011 08:59:56 +0000 (17:59 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 29 Nov 2011 08:59:56 +0000 (17:59 +0900)

Trivial merge