Merge remote-tracking branch 'origin/bug-827' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 6 Sep 2011 15:27:43 +0000 (17:27 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 6 Sep 2011 15:27:43 +0000 (17:27 +0200)

Trivial merge