Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sat, 19 Jan 2008 23:38:35 +0000 (10:38 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sat, 19 Jan 2008 23:38:35 +0000 (10:38 +1100)

Trivial merge