Merge commit 'origin/gallium-context-transfers-2'
authorKeith Whitwell <keithw@vmware.com>
Fri, 12 Mar 2010 09:08:40 +0000 (09:08 +0000)
committerKeith Whitwell <keithw@vmware.com>
Fri, 12 Mar 2010 09:08:40 +0000 (09:08 +0000)

Trivial merge