Merge branch 'master' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 13:46:37 +0000 (16:46 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 13:46:37 +0000 (16:46 +0300)

Trivial merge