Mesa (master): Merge branch 'mesa_7_6_branch'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Sep 25 09:00:19 2009 -0600

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/dri/intel/intel_clear.c

---