Mesa (gallium-0.2): Merge commit 'origin/gallium-0.1' into gallium-0.2

[Alan Hourihane]

Module: Mesa
Branch: gallium-0.2
Commit: 4af0d940a35536f096a9289470af0268a79402b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4af0d940a35536f096a9289470af0268a79402b3

Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Tue Nov 25 09:28:30 2008 +0000

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

Conflicts:

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

---