Merge branch 'asm-shader-rework-1'
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 21 Aug 2009 18:34:30 +0000 (11:34 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 21 Aug 2009 18:34:30 +0000 (11:34 -0700)

Trivial merge