Merge branch 'bug-946' into release 2011-06-08
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jun 2011 14:56:31 +0000 (16:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jun 2011 14:56:31 +0000 (16:56 +0200)

Trivial merge