Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian.paul@tungstengraphics.com>
Thu, 13 Sep 2007 20:45:22 +0000 (14:45 -0600)
committerBrian <brian.paul@tungstengraphics.com>
Thu, 13 Sep 2007 20:45:22 +0000 (14:45 -0600)

Trivial merge