Merge branch 'gallium-0.2' of git://anongit.freedesktop.org/mesa/mesa into gallium-0.2
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 6 Feb 2009 22:06:39 +0000 (14:06 -0800)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 6 Feb 2009 22:06:39 +0000 (14:06 -0800)

Trivial merge