Merge remote branch 'origin/fruitiex/wickedhud'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:22:01 +0000 (21:22 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:22:01 +0000 (21:22 +0200)

Trivial merge