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

Trivial merge