Merge branch 'bug-1033' into release
authorMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:38:34 +0000 (00:38 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:38:34 +0000 (00:38 +0200)

Trivial merge