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

Trivial merge