Merge remote-tracking branch 'origin/bug-948' into release 2011-07-21
authorMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 13:15:08 +0000 (15:15 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 13:15:08 +0000 (15:15 +0200)

Trivial merge