Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 16 May 2010 18:53:02 +0000 (20:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 16 May 2010 18:53:02 +0000 (20:53 +0200)

Trivial merge