Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 10:06:16 +0000 (13:06 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 10:06:16 +0000 (13:06 +0300)

Trivial merge