Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 23 Jan 2008 04:27:00 +0000 (15:27 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 23 Jan 2008 04:27:00 +0000 (15:27 +1100)
commit9043323f1437f9c6791845b3ddbb9af912b45110
treed9620f127c0789c8f7b2cbf91e6a035884f6612a
parent4481c6c0b3e90450b20f1e7b4a0edc3ce346a4bb
parent286380020b146d600ac86d519ddfbf765a5965b2
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1