Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 21:53:38 +0000 (00:53 +0300)

Trivial merge