Merge branch 'master' into fruitiex/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Sun, 18 Jul 2010 14:59:44 +0000 (16:59 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 18 Jul 2010 14:59:44 +0000 (16:59 +0200)

Trivial merge