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

[Keith Whitwell]

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

Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Wed Oct 15 17:20:30 2008 +0100

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

Conflicts:

	src/mesa/main/context.c

---