Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 10:18:10 +0000 (12:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 10:18:10 +0000 (12:18 +0200)

Trivial merge