Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 13 Jun 2010 20:35:49 +0000 (23:35 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 13 Jun 2010 20:35:49 +0000 (23:35 +0300)

Trivial merge