Merge remote branch 'origin/samual/balanceSamual'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 21 May 2010 21:18:06 +0000 (23:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 21 May 2010 21:18:06 +0000 (23:18 +0200)

Trivial merge