Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 18 Oct 2010 17:20:37 +0000 (19:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 18 Oct 2010 17:20:37 +0000 (19:20 +0200)

Trivial merge