Merge commit 'f4786ac' into ECC-INTEGRATION-1-5
authorWerner Koch <wk@gnupg.org>
Thu, 27 Jan 2011 05:51:04 +0000 (06:51 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 27 Jan 2011 05:51:04 +0000 (06:51 +0100)

Trivial merge