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

Trivial merge