Merge ssh://git-cacert.it-sls.de/var/cache/git/cacert-birdshack
authorMarkus Warg <mw@it-sls.de>
Mon, 23 Aug 2010 12:15:20 +0000 (14:15 +0200)
committerMarkus Warg <mw@it-sls.de>
Mon, 23 Aug 2010 12:15:20 +0000 (14:15 +0200)

Trivial merge