Merge branch 'bug-967' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 3 Jul 2012 22:59:27 +0000 (00:59 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 3 Jul 2012 22:59:27 +0000 (00:59 +0200)

Trivial merge