Merge remote-tracking branch 'origin/bug-1114' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 9 Dec 2012 23:08:33 +0000 (00:08 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 9 Dec 2012 23:08:33 +0000 (00:08 +0100)

Trivial merge