Merge branch 'bug-1070' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 11 Dec 2012 22:56:35 +0000 (23:56 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 11 Dec 2012 22:56:35 +0000 (23:56 +0100)

Trivial merge