Merge remote branch 'origin/savagex/g-23-relight'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 16:55:49 +0000 (18:55 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 16:55:49 +0000 (18:55 +0200)

Trivial merge