Merge branch 'bug-955' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 25 Sep 2011 14:51:25 +0000 (16:51 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 25 Sep 2011 14:51:25 +0000 (16:51 +0200)

Trivial merge