Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 27 Jan 2008 01:35:33 +0000 (12:35 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 27 Jan 2008 01:35:33 +0000 (12:35 +1100)

Trivial merge