Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Wed, 24 Nov 2010 17:39:14 +0000 (19:39 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 24 Nov 2010 17:39:14 +0000 (19:39 +0200)

Trivial merge