Merge remote branch 'origin/diabolik/trak-textures'
authortzork <jakob_mg@hotmail.com>
Tue, 25 Jan 2011 21:33:00 +0000 (22:33 +0100)
committertzork <jakob_mg@hotmail.com>
Tue, 25 Jan 2011 21:33:00 +0000 (22:33 +0100)

Trivial merge