Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 31 Jul 2010 16:50:09 +0000 (19:50 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 31 Jul 2010 16:50:09 +0000 (19:50 +0300)

Trivial merge