Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa
authorOliver McFadden <z3ro.geek@gmail.com>
Wed, 9 May 2007 14:23:22 +0000 (14:23 +0000)
committerOliver McFadden <z3ro.geek@gmail.com>
Wed, 9 May 2007 14:23:22 +0000 (14:23 +0000)

Trivial merge