Mesa (master): Merge branch 'mesa_7_5_branch'

[Keith Whitwell]

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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Aug 13 15:57:23 2009 +0100

Merge branch 'mesa_7_5_branch'

---