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

Trivial merge