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