Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Tue, 18 Dec 2007 00:02:46 +0000 (11:02 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Tue, 18 Dec 2007 00:02:46 +0000 (11:02 +1100)
commit015871a0753cb984f8a93232a7e8334a24b08406
treec5123bee6f600fbe44f15b77321fb9f60aea5392
parentc5ffd8e9afd3df1d4daf189344ec8cbf8a021143
parent04a5a8b3bcba64c506ee5646a3a8b737e124a66a
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1