Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 17 Jul 2010 15:02:52 +0000 (18:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 17 Jul 2010 15:02:52 +0000 (18:02 +0300)

Trivial merge