Merge remote branch 'origin/fruitiex/cuinnton_stormkeep'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:25:32 +0000 (17:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:25:32 +0000 (17:25 +0100)

Trivial merge