Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 20:01:04 +0000 (23:01 +0300)

Trivial merge