Merge branch 'master' into divVerent/skyboxes
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 13:09:05 +0000 (15:09 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 13:09:05 +0000 (15:09 +0200)

Trivial merge