[f-spot: 2/2] Merge branch 'FSPOT_0_6_0_STABLE'

[Ruben Vermeersch <rubenv src gnome org>]

commit 3134384ec00b7b33d9a9ad645be9307715b1aabb
Merge: c3c7176... 4f4a645...
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Aug 11 02:07:49 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 configure.ac                                     |    4 ++--
 extensions/Exporters/CDExport/Makefile.am        |    1 +
 extensions/Exporters/FacebookExport/Makefile.am  |    1 +
 extensions/Exporters/FlickrExport/Makefile.am    |    1 +
 extensions/Exporters/FolderExport/Makefile.am    |    1 +
 extensions/Exporters/GalleryExport/Makefile.am   |    1 +
 extensions/Exporters/PicasaWebExport/Makefile.am |    1 +
 extensions/Exporters/SmugMugExport/Makefile.am   |    1 +
 extensions/Exporters/TabbloExport/Makefile.am    |    1 +
 extensions/Exporters/ZipExport/Makefile.am       |    1 +
 extensions/Services/BeagleService/Makefile.am    |    1 +
 extensions/Tools/ChangePhotoPath/Makefile.am     |    1 +
 extensions/Tools/DevelopInUFraw/Makefile.am      |    1 +
 extensions/Tools/HashJob/Makefile.am             |    1 +
 extensions/Tools/MergeDb/Makefile.am             |    1 +
 extensions/Tools/RawPlusJpeg/Makefile.am         |    1 +
 tests/src/Makefile.am                            |    1 +
 17 files changed, 18 insertions(+), 2 deletions(-)
---