Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)

Trivial merge