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