Merge branch 'release' into bug-964
authorMichael Tänzer <neo@nhng.de>
Mon, 23 Jul 2012 15:40:24 +0000 (17:40 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 23 Jul 2012 15:40:24 +0000 (17:40 +0200)

Trivial merge