Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa...
authorBrian <brian@nostromo.localnet.net>
Mon, 26 Feb 2007 21:34:57 +0000 (14:34 -0700)
committerBrian <brian@nostromo.localnet.net>
Mon, 26 Feb 2007 21:34:57 +0000 (14:34 -0700)

Trivial merge