Merge remote branch 'origin/savagex/red-planet-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 15:07:42 +0000 (16:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 15:07:42 +0000 (16:07 +0100)

Trivial merge