Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 18 Dec 2007 00:02:46 +0000 (11:02 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 18 Dec 2007 00:02:46 +0000 (11:02 +1100)

Trivial merge