Merge branch 'bug-959' into release 2011-08-01
authorMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:32:15 +0000 (03:32 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:32:15 +0000 (03:32 +0200)

Trivial merge