Merge branch 'gallium-docs'
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Tue, 5 Jan 2010 16:37:49 +0000 (08:37 -0800)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Tue, 5 Jan 2010 16:37:49 +0000 (08:37 -0800)

Trivial merge