Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 28 Jan 2008 07:34:21 +0000 (18:34 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 28 Jan 2008 07:34:21 +0000 (18:34 +1100)

Trivial merge