Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 28 Oct 2010 18:14:14 +0000 (21:14 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 28 Oct 2010 18:14:14 +0000 (21:14 +0300)

Trivial merge