Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/winsys/gdi/SConscript

diff --cc common.py
Simple merge

diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer.h
Simple merge

diff --cc src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
Simple merge

diff --cc src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
Simple merge

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

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

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

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