Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 21 Nov 2007 04:38:28 +0000 (15:38 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 21 Nov 2007 04:38:28 +0000 (15:38 +1100)

Trivial merge