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

Trivial merge