Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 21:20:01 +0000 (22:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 21:20:01 +0000 (22:20 +0100)

Trivial merge