Merge remote branch 'origin/gallium-st-api-dri'
authorChia-I Wu <olv@lunarg.com>
Sun, 21 Mar 2010 08:32:34 +0000 (16:32 +0800)
committerChia-I Wu <olv@lunarg.com>
Sun, 21 Mar 2010 08:32:34 +0000 (16:32 +0800)

Trivial merge