Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 20:13:31 +0000 (21:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 20:13:31 +0000 (21:13 +0100)

Trivial merge