Mesa (master): Merge branches 'master' and 'master' of ssh://git. freedesktop.org/git/mesa/mesa

[Vinson Lee]

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

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Jul  8 15:58:23 2010 -0700

Merge branches 'master' and 'master' of ssh://git.freedesktop.org/git/mesa/mesa

---