Merge branch 'mesa-2d-registers'
authorZack Rusin <zackr@vmware.com>
Wed, 14 Jul 2010 01:54:14 +0000 (21:54 -0400)
committerZack Rusin <zackr@vmware.com>
Wed, 14 Jul 2010 01:54:14 +0000 (21:54 -0400)

Trivial merge