Merge remote branch 'origin/morphed/minelayer'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 14:14:02 +0000 (15:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 14:14:02 +0000 (15:14 +0100)

Trivial merge