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

diff --cc src/gallium/auxiliary/draw/draw_pipe_pstipple.c
Simple merge

diff --cc src/gallium/auxiliary/util/u_blit.c
Simple merge

diff --cc src/gallium/auxiliary/util/u_gen_mipmap.c
Simple merge

diff --cc src/gallium/drivers/i915simple/i915_screen.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_context.c
Simple merge

diff --cc src/gallium/winsys/xlib/xm_winsys.c
Simple merge

diff --cc src/mesa/state_tracker/st_atom_pixeltransfer.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_texture.c
Simple merge