Merge branch 'bug-846' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 20 Oct 2011 21:24:28 +0000 (23:24 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 20 Oct 2011 21:24:28 +0000 (23:24 +0200)

Trivial merge