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

Conflicts:

	scons/gallium.py
	src/gallium/auxiliary/pipebuffer/pb_buffer.h

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/gallium/winsys/gdi/SConscript
index b463fa6,dce81ec..cc6aa66
--- 1/src/gallium/winsys/gdi/SConscript
--- 2/src/gallium/winsys/gdi/SConscript
+++ b/src/gallium/winsys/gdi/SConscript
@@@ -8,15 -8,21 +8,21 @@@ if env['platform'] == 'windows'
        env = env.Clone()
  
        env.Append(CPPPATH = [
 -              '#src/mesa/glapi',
 -              '#src/mesa',
 -              '#src/mesa/main',
 +              '#src/mesa/state_tracker/wgl',
 +      ])
 +
 +      env.Append(CPPDEFINES = [
        ])
  
+       env.Append(CPPDEFINES = [
+               '__GL_EXPORTS',
+               'BUILD_GL32',
+               '_GNU_H_WINDOWS32_DEFINES',
+       ])
+ 
        sources = [
 -              'opengl32.def',
 -              'wgl.c',
 -              'wmesa.c',
 +              '#src/mesa/state_tracker/wgl/opengl32.def',
 +              'gdi_softpipe_winsys.c',
        ]
                
        drivers = [