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)
commit16f0efca605600bdac83898f1505af99c4c71048
treef2c7e42f8f56fac25eb79e5fb434b99d9c5eaa59
parent5ca107a4f215b84176123fd7a2d5fe14508a9f62
parent1d312ae0137eb39bf74fac91eb97ed25c289a4ca
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa