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

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Dec 30 18:01:15 2008 -0700

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/main/config.h

---