Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 13:42:29 +0000 (16:42 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 27 Jul 2010 13:42:29 +0000 (16:42 +0300)

Trivial merge