Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 23 Dec 2007 05:01:59 +0000 (16:01 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 23 Dec 2007 05:01:59 +0000 (16:01 +1100)

Trivial merge