Merge remote branch 'refs/remotes/origin/diabolik/seraphinaplayermodel'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:08:23 +0000 (20:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:08:23 +0000 (20:08 +0200)

Trivial merge