Merge branch 'bug-827' into release
authorBernhard Froehlich <bernhard@cacert.org>
Fri, 7 Oct 2011 19:44:53 +0000 (21:44 +0200)
committerBernhard Froehlich <bernhard@cacert.org>
Fri, 7 Oct 2011 19:44:53 +0000 (21:44 +0200)

Trivial merge