Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sun, 25 Nov 2007 02:00:15 +0000 (13:00 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 25 Nov 2007 02:00:15 +0000 (13:00 +1100)

Trivial merge