Merge remote branch 'origin/savagex/stormkeepfixes'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 14:56:13 +0000 (15:56 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 14:56:13 +0000 (15:56 +0100)

Trivial merge