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)
commitf67bc2e87255298ac22e8ccd98f482cc62d0ec26
treec529b62cd2febd8ebab70ecf6a5df54a53b2ef72
parentf7455ad7af09b5ef31ccc454b79422a13c59af9a
parentf7fb30f03badf7f3ac5d66e87acb8cbb1c5aee0b
Merge branch 'mesa_7_6_branch'

Conflicts:

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