Mesa (master): Merge branch 'xa_branch'

[Thomas Hellstrom]

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

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Mon Jul  4 10:21:35 2011 +0200

Merge branch 'xa_branch'

Conflicts:
	configure.ac

Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>

---