Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian.paul@tungstengraphics.com>
Wed, 20 Jun 2007 00:50:26 +0000 (18:50 -0600)
committerBrian <brian.paul@tungstengraphics.com>
Wed, 20 Jun 2007 00:50:26 +0000 (18:50 -0600)

Trivial merge