Mesa (master): Merge branch 'gallium-newclear'

[Roland Scheidegger]

Module: Mesa
Branch: master
Commit: 992382762a74fd834926fd2c3cd9e14a186e2dd5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=992382762a74fd834926fd2c3cd9e14a186e2dd5

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Thu Jun  3 17:46:14 2010 +0200

Merge branch 'gallium-newclear'

Conflicts:
	src/gallium/state_trackers/python/p_context.i

---