Merge branch 'bug-1023' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 30 May 2012 19:56:34 +0000 (21:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 30 May 2012 19:56:34 +0000 (21:56 +0200)

Trivial merge