Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 12:04:13 +0000 (15:04 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 12:04:13 +0000 (15:04 +0300)

Trivial merge