Merge branch 'bug-1141' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:46:14 +0000 (01:46 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:46:14 +0000 (01:46 +0100)

Trivial merge