Mesa (mesa_7_7_branch): Merge commit 'mesa_7_6_branch' into mesa_7_7_branch

[Jakob Bornecrantz]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 0c75854cc1650dc870e042aa66a053e70b3d4556
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c75854cc1650dc870e042aa66a053e70b3d4556

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Dec  2 14:52:51 2009 +0100

Merge commit 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	src/mesa/main/version.h

---