Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 8 Oct 2009 15:28:07 +0000 (09:28 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 8 Oct 2009 15:28:07 +0000 (09:28 -0600)
Conflicts:

src/mesa/drivers/common/meta.c

1  2 
src/mesa/drivers/common/meta.c

Simple merge