Merge branch 'bug-940' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 24 Nov 2011 16:17:30 +0000 (17:17 +0100)
committerMichael Tänzer <neo@nhng.de>
Thu, 24 Nov 2011 16:17:30 +0000 (17:17 +0100)

Trivial merge