Merge branch 'master-merge' into vbo-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Tue, 16 Jan 2007 09:47:26 +0000 (09:47 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Tue, 16 Jan 2007 09:47:26 +0000 (09:47 +0000)

Trivial merge