Merge branch 'bug-827' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 26 Oct 2011 12:13:38 +0000 (14:13 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 26 Oct 2011 12:13:38 +0000 (14:13 +0200)

Trivial merge