Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 25 Jul 2010 12:36:35 +0000 (15:36 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 25 Jul 2010 12:36:35 +0000 (15:36 +0300)

Trivial merge