Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 23 Jan 2008 04:27:00 +0000 (15:27 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 23 Jan 2008 04:27:00 +0000 (15:27 +1100)

Trivial merge