Merge remote branch 'origin/fruitiex/panelhud'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 15 Dec 2010 18:06:23 +0000 (19:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 15 Dec 2010 18:06:23 +0000 (19:06 +0100)

Trivial merge