Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 15 Aug 2010 12:35:08 +0000 (14:35 +0200)

Trivial merge