Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorWerner Koch <wk@gnupg.org>
Fri, 20 May 2011 08:30:36 +0000 (10:30 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 20 May 2011 08:30:36 +0000 (10:30 +0200)

Trivial merge