Merge branch 'master' into divVerent/skyboxes
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:01:08 +0000 (01:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:01:08 +0000 (01:01 +0200)

Trivial merge