Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch