Merge branch 'release' into testserver-mods
authorMichael Tänzer <neo@nhng.de>
Tue, 29 Mar 2011 17:46:41 +0000 (19:46 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 29 Mar 2011 17:46:41 +0000 (19:46 +0200)

Trivial merge