Merge branch 'master' into fruitiex/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 04:17:19 +0000 (06:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 04:17:19 +0000 (06:17 +0200)

Trivial merge