Merge commit 'origin/master' into texture_swizzle
authorBrian Paul <brianp@vmware.com>
Wed, 28 Jan 2009 21:45:18 +0000 (14:45 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 28 Jan 2009 21:45:18 +0000 (14:45 -0700)

Trivial merge