Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 15:40:50 +0000 (09:40 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 15:40:50 +0000 (09:40 -0600)
1  2 
src/mesa/main/image.c

Simple merge