Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 12 Dec 2007 23:41:43 +0000 (10:41 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 12 Dec 2007 23:41:43 +0000 (10:41 +1100)

Trivial merge