Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:05:41 +0000 (19:05 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:05:41 +0000 (19:05 +0200)

Trivial merge