Merge branch 'master' into divVerent/skyboxes
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Jul 2010 13:32:25 +0000 (15:32 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Jul 2010 13:32:25 +0000 (15:32 +0200)

Trivial merge