Merge branches 'master' and 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorVinson Lee <vlee@vmware.com>
Thu, 8 Jul 2010 22:58:23 +0000 (15:58 -0700)
committerVinson Lee <vlee@vmware.com>
Thu, 8 Jul 2010 22:58:23 +0000 (15:58 -0700)
commit6dd7d654db6b02ba47256546e7a7ad5bbd37f3a8
tree91c9c5e139d729e92b3db0c4005ff0dc582f4576
parent392a2515c0967c395be098cac6a37f325dd66b90
Merge branches 'master' and 'master' of ssh://git.freedesktop.org/git/mesa/mesa