Merge branch 'release' of ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel...
authordirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 21:39:45 +0000 (23:39 +0200)
committerdirk <beliebige_email_adresse@fidocon.de>
Tue, 25 Oct 2011 21:39:45 +0000 (23:39 +0200)

Trivial merge