Merge remote branch 'origin/fruitiex/warpzone'
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:41:14 +0000 (11:41 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:41:14 +0000 (11:41 +0200)

Trivial merge