Merge branch 'gallium-conditional-rendering'
authorBrian Paul <brianp@vmware.com>
Mon, 4 Jan 2010 18:47:39 +0000 (11:47 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 4 Jan 2010 18:47:39 +0000 (11:47 -0700)

Trivial merge