Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/glsl/Makefile

src/mesa/shader/prog_statevars.c

@@ -632,7 +632,7 @@ append(char *dst, const char *src)
 
 
 /**
- * Convert token 'k' to a string, append it only 'dst' string.
+ * Convert token 'k' to a string, append it onto 'dst' string.
  */
 static void
 append_token(char *dst, gl_state_index k)
@@ -807,7 +807,8 @@ append_token(char *dst, gl_state_index k)
       append(dst, "ShadowAmbient");
       break;
    default:
-      ;
+      /* probably STATE_INTERNAL_DRIVER+i (driver private state) */
+      append(dst, "driverState");
    }
 }