Mesa (master): Merge branch 'primitive-restart-cleanup'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Oct 21 19:05:40 2010 -0600

Merge branch 'primitive-restart-cleanup'

Conflicts:
	docs/relnotes-7.10.html

This branch is a re-do of the primitive-restart branch with all
the intermediate/temporary stuff cleaned out.

---