Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 2 Jan 2008 12:02:35 +0000 (23:02 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 2 Jan 2008 12:02:35 +0000 (23:02 +1100)

Trivial merge