Merge remote-tracking branch 'origin/bug-1082' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:17:34 +0000 (01:17 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:17:34 +0000 (01:17 +0100)

Trivial merge