Merge branch 'bug-882' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 15 Nov 2011 22:07:24 +0000 (23:07 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 15 Nov 2011 22:07:24 +0000 (23:07 +0100)

Trivial merge