Merge branch 'bug-1075' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:27 +0000 (02:28 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:27 +0000 (02:28 +0200)

Trivial merge