Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
authorIan Romanick <idr@us.ibm.com>
Fri, 5 Jan 2007 02:37:10 +0000 (18:37 -0800)
committerIan Romanick <idr@us.ibm.com>
Fri, 5 Jan 2007 02:37:10 +0000 (18:37 -0800)

Trivial merge