Merge remote-tracking branch 'origin/master' into samual/balance
authorFruitieX <fruitiex@gmail.com>
Thu, 19 May 2011 19:38:40 +0000 (22:38 +0300)
committerFruitieX <fruitiex@gmail.com>
Thu, 19 May 2011 19:38:40 +0000 (22:38 +0300)

Trivial merge