Merge branch 'gallium-tex-surfaces' into gallium-0.1