Mesa (master): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[Brian Paul]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Sep 10 11:24:56 2009 -0700

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
	src/mesa/drivers/dri/intel/intel_context.c

---