Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 13 Feb 2008 03:21:23 +0000 (14:21 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 13 Feb 2008 03:21:23 +0000 (14:21 +1100)

Trivial merge