Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2