Merge branch 'bug-876' into release 2010-11-23
authorMichael Tänzer <neo@nhng.de>
Tue, 23 Nov 2010 19:51:01 +0000 (20:51 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 23 Nov 2010 19:51:01 +0000 (20:51 +0100)

Trivial merge