Merge branch 'mesa_7_6_branch'
authorIan Romanick <ian.d.romanick@intel.com>
Mon, 28 Sep 2009 19:03:23 +0000 (12:03 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Mon, 28 Sep 2009 19:03:23 +0000 (12:03 -0700)
commit41865d991f5703b6a9faa33ee6ac1d256af5c2a2
tree1b38ccc1ba9151c17dbc037c59b802043f9ca39f
parent05bad193f56d48384097e37e47fae3fdda85f144
parentd39fd9f641df7da77ff6158c5aa249dd90bf420d
Merge branch 'mesa_7_6_branch'

Conflicts:
Makefile
src/mesa/main/version.h