Mesa (master): Merge branch 'mesa_7_5_branch'

[Thomas Hellstrom]

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

Author: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Date:   Mon Jun 15 11:43:48 2009 +0200

Merge branch 'mesa_7_5_branch'

Conflicts:

	progs/util/extfuncs.h

---