Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorStéphane Marchesin <marcheu@chromium.org>
Tue, 7 Jun 2011 03:42:30 +0000 (20:42 -0700)
committerStéphane Marchesin <marcheu@chromium.org>
Tue, 7 Jun 2011 03:42:30 +0000 (20:42 -0700)
commit7d2cb9a53c288ddafdf9cfd1b3162bcbb903de96
treee73db7e19964211360dfe1096e029920c8cf98a6
parentabb436526974bd090853c0927ece0839f9143393
parent22c320aa2c459474a0d220a40b849bf7e4864251
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa