Merge remote branch 'origin/divVerent/redplanet-recompile'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 18:06:56 +0000 (19:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 18:06:56 +0000 (19:06 +0100)

Trivial merge