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

[Alan Hourihane]

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

Author: Alan Hourihane <alanh at vmware.com>
Date:   Fri Jan 16 16:44:53 2009 +0000

Merge commit 'origin/master' into gallium-0.2

Conflicts:
	src/mesa/shader/slang/slang_compile.c

---