Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 24 Jul 2010 17:26:32 +0000 (19:26 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 24 Jul 2010 17:26:32 +0000 (19:26 +0200)

Trivial merge