Merge remote branch 'origin/fruitiex/stormkeep'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 30 Dec 2010 19:22:48 +0000 (20:22 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 30 Dec 2010 19:22:48 +0000 (20:22 +0100)

Trivial merge