Mesa (master): Merge branch 'mesa_7_5_branch'

[Michel Dänzer]

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

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Sun Aug 30 13:06:18 2009 +0200

Merge branch 'mesa_7_5_branch'

Conflicts:
	src/glx/x11/glxcmds.c

---