Merge branch 'bug-1024' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 10 Aug 2012 11:47:11 +0000 (13:47 +0200)
committerMichael Tänzer <neo@nhng.de>
Fri, 10 Aug 2012 11:47:11 +0000 (13:47 +0200)

Trivial merge