Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
authorBrian <brian.paul@tungstengraphics.com>
Thu, 21 Jun 2007 22:04:04 +0000 (16:04 -0600)
committerBrian <brian.paul@tungstengraphics.com>
Thu, 21 Jun 2007 22:04:04 +0000 (16:04 -0600)

Trivial merge