Merge remote-tracking branch 'origin/bug-977' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 10 Dec 2012 00:34:35 +0000 (01:34 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 10 Dec 2012 00:34:35 +0000 (01:34 +0100)

Trivial merge