Merge branch 'mesa_7_5_branch'
authorThomas Hellstrom <thellstrom-at-vmware-dot-com>
Mon, 15 Jun 2009 09:43:48 +0000 (11:43 +0200)
committerThomas Hellstrom <thellstrom-at-vmware-dot-com>
Mon, 15 Jun 2009 09:43:48 +0000 (11:43 +0200)
commitf5888d9ca56ba68c01a4c9f111174650fac943aa
tree2943286e0edda3342b4439e20c3d960c26096057
parente0eafde746fee546b16205e4a605e28f78e120f9
parentcbe5af766eb52516e50d38c379bbde3391f6c0c2
Merge branch 'mesa_7_5_branch'

Conflicts:

progs/util/extfuncs.h
progs/util/extfuncs.h