Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 21 Jul 2010 09:02:18 +0000 (12:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 21 Jul 2010 09:02:18 +0000 (12:02 +0300)

Trivial merge