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

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan  6 08:15:54 2009 -0700

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/drivers/dri/common/dri_util.c

---