Merge remote branch 'refs/remotes/origin/diabolik/sourceforplayers'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 18:43:55 +0000 (20:43 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 18:43:55 +0000 (20:43 +0200)

Trivial merge