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)
commit6c14cf58343135491068e96575bf4e61a6d34c87
tree0b826725f867a706d558492ac9abf881ab06e7a5
parentbf2410ca73d1eabc7134e51855d0b603897229e4
parent4fa7afabc966a3d37324f2f9b03e1cc466db7773
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1