Merge branch 'bug-882' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 5 Oct 2011 19:38:05 +0000 (21:38 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 5 Oct 2011 19:38:05 +0000 (21:38 +0200)

Trivial merge