Mesa (master): Merge remote branch 'origin/mesa_7_6_branch'

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 49d402e275cdaf46de8db5a475dfe00509141195
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=49d402e275cdaf46de8db5a475dfe00509141195

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Oct 23 14:19:52 2009 -0700

Merge remote branch 'origin/mesa_7_6_branch'

Conflicts:
	src/mesa/drivers/dri/intel/intel_fbo.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.h
	src/mesa/drivers/dri/intel/intel_tex_copy.c
	src/mesa/drivers/dri/intel/intel_tex_image.c

---