Merge branch 'master' into fruitiex/newpanelhud
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 11:56:01 +0000 (13:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 11:56:01 +0000 (13:56 +0200)

Trivial merge