Merge remote branch 'origin/savagex/assaultfixes'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:52:43 +0000 (19:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:52:43 +0000 (19:52 +0200)

Trivial merge