Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 10:09:52 +0000 (21:09 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 10:09:52 +0000 (21:09 +1100)

Trivial merge