Merge remote branch 'refs/remotes/origin/diabolik/nexmodel'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 08:36:15 +0000 (10:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 08:36:15 +0000 (10:36 +0200)

Trivial merge