Merge remote branch 'origin/fruitiex/panelhud'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:14 +0000 (14:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:14 +0000 (14:07 +0100)

Trivial merge