Merge branch 'master'.
authorWerner Koch <wk@gnupg.org>
Mon, 23 May 2011 11:48:30 +0000 (13:48 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 23 May 2011 11:48:30 +0000 (13:48 +0200)
commit2d559392b5d2044fc780bfec211f1af9317a5b8f
tree7deffc37af5cd14eb1046304e816c68f5d2a3c15
parentae49d25a106bb5fae6c82115723130fda6572a68
parentb6535a9b5b5ebb3f77c7bf97e72a99dd2d006cca
Merge branch 'master'.

Actually the same fix I did a few hours ago.
cipher/ChangeLog
cipher/pubkey.c