Merge branch 'bug-827' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 7 Aug 2011 22:03:52 +0000 (00:03 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 7 Aug 2011 22:03:52 +0000 (00:03 +0200)

Trivial merge