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

Trivial merge