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

[Keith Whitwell]

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

Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Tue Sep 23 17:08:24 2008 -0700

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/glapi/glapi_getproc.c
	src/mesa/main/image.c
	src/mesa/shader/slang/slang_link.c

---