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

Trivial merge