Merge remote branch 'origin/fruitiex/stormkeep'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 30 Oct 2010 14:45:00 +0000 (16:45 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 30 Oct 2010 14:45:00 +0000 (16:45 +0200)

Trivial merge