Merge remote-tracking branch 'origin/release' into release 2011-07-28
authorMichael Tänzer <neo@nhng.de>
Thu, 28 Jul 2011 21:52:25 +0000 (23:52 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 28 Jul 2011 21:52:25 +0000 (23:52 +0200)

Trivial merge