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.

diff --cc docs/relnotes-7.10.html
index 4d342dc,98b70b8..2d0adcc
--- 1/docs/relnotes-7.10.html
--- 2/docs/relnotes-7.10.html
+++ b/docs/relnotes-7.10.html
@@@ -35,7 -35,7 +35,8 @@@ tb
  <h2>New features</h2>
  <ul>
  <li>GL_ARB_explicit_attrib_location extension (Intel and software drivers).
 +<li>GL_ARB_texture_rg (Intel, software drivers, gallium drivers).
+ <li>GL_NV_primitive_restart extension (Gallium softpipe, llvmpipe).
  </ul>