Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 11:26:32 +0000 (13:26 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 11:26:32 +0000 (13:26 +0200)

Trivial merge