Merge branch 'bug-827' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 27 Nov 2011 03:50:51 +0000 (04:50 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 27 Nov 2011 03:50:51 +0000 (04:50 +0100)

Trivial merge