Mesa (master): Merge branch 'mesa_7_5_branch'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed May 13 10:33:21 2009 -0600

Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/arrayobj.c
	src/mesa/main/arrayobj.h
	src/mesa/main/context.c

---