Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorWerner Koch <wk@gnupg.org>
Thu, 24 Nov 2011 15:16:43 +0000 (16:16 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 24 Nov 2011 15:16:43 +0000 (16:16 +0100)

Trivial merge