Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
authorunknown <kwschult@.na.qualcomm.com>
Wed, 10 Feb 2010 17:55:01 +0000 (10:55 -0700)
committerunknown <kwschult@.na.qualcomm.com>
Wed, 10 Feb 2010 17:55:01 +0000 (10:55 -0700)

Trivial merge