Merge branch 'bug-1003' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 28 Mar 2012 19:54:02 +0000 (21:54 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 28 Mar 2012 19:54:02 +0000 (21:54 +0200)

Trivial merge