Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 27 Nov 2010 12:38:57 +0000 (13:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 27 Nov 2010 12:38:57 +0000 (13:38 +0100)

Trivial merge