Merge branch 'bug-1198' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:56:36 +0000 (20:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:56:36 +0000 (20:56 +0200)

Trivial merge