Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 17 Oct 2010 20:21:45 +0000 (22:21 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 17 Oct 2010 20:21:45 +0000 (22:21 +0200)

Trivial merge