Merge branch 'glsl-1.20-v2'
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 16 Dec 2008 01:25:43 +0000 (18:25 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 16 Dec 2008 01:25:43 +0000 (18:25 -0700)

Trivial merge