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

Trivial merge