Merge branch 'mesa_7_6_branch'

diff --cc common.py
Simple merge

diff --cc src/mesa/drivers/common/meta.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_draw.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_draw_upload.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_read.c
Simple merge