p
Merge remote-tracking branch 'origin/gallium-nine' into gallium-nine

Conflicts:
	src/gallium/state_trackers/nine/nine_shader.c
Merge remote-tracking branch 'origin/gallium-nine' into gallium-nine
Fix cursor on world of warcraft