Merge branch 'bug-957' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 26 Dec 2011 19:13:00 +0000 (20:13 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 26 Dec 2011 19:13:00 +0000 (20:13 +0100)

Trivial merge