Merge remote branch 'refs/remotes/origin/diabolik/lodplayers'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 4 Jul 2010 19:11:10 +0000 (21:11 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 4 Jul 2010 19:11:10 +0000 (21:11 +0200)

Trivial merge