Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
authorjoukj <joukj@tarantella.(none)>
Fri, 30 Nov 2007 10:12:41 +0000 (11:12 +0100)
committerjoukj <joukj@tarantella.(none)>
Fri, 30 Nov 2007 10:12:41 +0000 (11:12 +0100)
commit86f3135fbd9db9ca08a6c0bfc620345c8a8e3f04
tree586dca229d09fb523554dd07ad39c9bf422ab927
parentd1414da8f9dbf3c27cf05509be51e8c70ed1185d
parentd2540e6d4bdcfcda195f6dcf43f75b810001c227
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa