Merge branch 'r500test' of git://people.freedesktop.org/~airlied/mesa into r345-cleanup