Merge branch 'hiz' of ssh://people.freedesktop.org/~chadversary/mesa
authorChad Versace <chad.versace@linux.intel.com>
Tue, 22 Nov 2011 18:52:29 +0000 (10:52 -0800)
committerChad Versace <chad.versace@linux.intel.com>
Tue, 22 Nov 2011 18:52:29 +0000 (10:52 -0800)

Trivial merge