Merge remote branch 'origin/fruitiex/red-planet-zfight'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:25:16 +0000 (07:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:25:16 +0000 (07:25 +0100)

Trivial merge