Merge branch 'bug-897' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 12:41:54 +0000 (14:41 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 12:41:54 +0000 (14:41 +0200)

Trivial merge