Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Fri, 14 Dec 2007 22:48:11 +0000 (09:48 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 14 Dec 2007 22:48:11 +0000 (09:48 +1100)

Trivial merge