Merge remote branch 'origin/fruitiex/lightshaders'
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:39:27 +0000 (11:39 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 24 Aug 2010 09:39:27 +0000 (11:39 +0200)

Trivial merge