Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 20 Jul 2010 09:38:27 +0000 (12:38 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 20 Jul 2010 09:38:27 +0000 (12:38 +0300)

Trivial merge