Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa
authorGeorge Sapountzis <gsapountzis@gmail.com>
Sun, 21 Mar 2010 13:05:21 +0000 (15:05 +0200)
committerGeorge Sapountzis <gsapountzis@gmail.com>
Sun, 21 Mar 2010 13:05:21 +0000 (15:05 +0200)

Trivial merge