Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h

diff --cc Makefile
Simple merge

diff --cc docs/relnotes.html
index 936f565236d62e6fb07998b5459981b839155a18,45746268af9451aeecf228f8162f6e13c123986f..ad5b74bad3c43c4a5e01175453e44c082882950b
--- 1/docs/relnotes.html
--- 2/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -20,8 -20,8 +20,9 @@@ The release notes summarize what's new 
  </p>
  
  <UL>
 +<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
  <LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
+ <LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A>
  <LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A>
  <LI><A HREF="relnotes-7.4.html">7.4 release notes</A>
  <LI><A HREF="relnotes-7.3.html">7.3 release notes</A>

diff --cc src/mesa/main/mipmap.c
Simple merge