Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <fruitiex@gmail.com>
Fri, 5 Nov 2010 06:15:58 +0000 (08:15 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 5 Nov 2010 06:15:58 +0000 (08:15 +0200)

Trivial merge