Merge branch 'r300-vertprog-branch' of ssh://people.freedesktop.org/~z3ro/mesa