Merge remote branch 'origin/fruitiex/nexballtextures'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:24:10 +0000 (15:24 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:24:10 +0000 (15:24 +0100)

Trivial merge