Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 20:02:05 +0000 (23:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 20:02:05 +0000 (23:02 +0300)

Trivial merge