Merge branch 'bug-953' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 01:01:05 +0000 (02:01 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 01:01:05 +0000 (02:01 +0100)

Trivial merge