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

Trivial merge