Mesa (nvc0): Merge remote branch 'origin/master' into nvc0-new

[Ben Skeggs]

Module: Mesa
Branch: nvc0
Commit: e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Tue Dec 21 06:30:39 2010 +1000

Merge remote branch 'origin/master' into nvc0-new

Conflicts:
	src/gallium/drivers/nouveau/nouveau_winsys.h

---