Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian.paul@tungstengraphics.com>
Tue, 9 Oct 2007 18:36:56 +0000 (12:36 -0600)
committerBrian <brian.paul@tungstengraphics.com>
Tue, 9 Oct 2007 18:36:56 +0000 (12:36 -0600)

Trivial merge