Merge branch 'gallium-0.2' into gallium-winsys-private