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

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 22 13:44:43 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:

	src/mesa/main/bufferobj.c

---