Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
authorIan Romanick <idr@us.ibm.com>
Tue, 6 Mar 2007 19:50:33 +0000 (11:50 -0800)
committerIan Romanick <idr@us.ibm.com>
Tue, 6 Mar 2007 19:50:33 +0000 (11:50 -0800)

Trivial merge