Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sat, 9 Feb 2008 05:15:14 +0000 (16:15 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sat, 9 Feb 2008 05:15:14 +0000 (16:15 +1100)

Trivial merge