Merge branch 'bug-855' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 19 Jan 2012 18:59:54 +0000 (19:59 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 19 Jan 2012 18:59:54 +0000 (19:59 +0100)

Trivial merge