Mesa (master): Merge branch 'mesa_7_5_branch'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jul 28 08:58:25 2009 -0600

Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/mesa/main/version.h

---