Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 2 Jan 2008 12:02:35 +0000 (23:02 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 2 Jan 2008 12:02:35 +0000 (23:02 +1100)
commit720fd7b5e993c7e77e5b1fc75edeedd110532e0e
tree568e60e4e3a09ca09a16fc59b709c81b7c9a23ee
parent92ee96d83d26e56857b2999356d7c2a75e6eaf76
parentda92ac01e80e8a83233b1d4a881503bfc2806a1a
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1