Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
authorMaciej Cencora <m.cencora@gmail.com>
Mon, 12 Jul 2010 21:42:06 +0000 (23:42 +0200)
committerMaciej Cencora <m.cencora@gmail.com>
Mon, 12 Jul 2010 21:42:06 +0000 (23:42 +0200)

Trivial merge