Merge remote-tracking branch 'origin/bug-596' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 12 Oct 2011 14:51:22 +0000 (16:51 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 12 Oct 2011 14:51:22 +0000 (16:51 +0200)

Trivial merge