Merge branch 'bug-940' into release
authorBernhard Fröhlich <bernhard@cacert.org>
Tue, 20 Sep 2011 20:00:02 +0000 (22:00 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Tue, 20 Sep 2011 20:00:02 +0000 (22:00 +0200)

Trivial merge