Merge remote-tracking branch 'origin/bug-846' into bug-846 bug-846
authorBernhard Froehlich <bernhard@cacert.org>
Sat, 24 Sep 2011 23:34:43 +0000 (01:34 +0200)
committerBernhard Froehlich <bernhard@cacert.org>
Sat, 24 Sep 2011 23:34:43 +0000 (01:34 +0200)

Trivial merge