Merge branch 'bug-954' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 27 Jul 2011 21:10:23 +0000 (23:10 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 27 Jul 2011 21:10:23 +0000 (23:10 +0200)

Trivial merge