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

[Brian Paul]

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

Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Oct 17 14:13:00 2008 -0600

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

Conflicts:

	progs/trivial/tri.c

---