Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 19:35:32 +0000 (22:35 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 19:35:32 +0000 (22:35 +0300)

Trivial merge