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

[Stephane Delcroix <sdelcroix src gnome org>]

commit a86bf25ab6242d992633934704a359513c5e0aa0
Merge: 1007799... 07f2cd2...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Thu Aug 27 12:23:26 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 extensions/Exporters/FlickrExport/Makefile.am    |    4 ++--
 extensions/Exporters/PicasaWebExport/Makefile.am |    4 ++--
 extensions/Exporters/SmugMugExport/Makefile.am   |    4 ++--
 extensions/Exporters/TabbloExport/Makefile.am    |    2 +-
 src/Makefile.am                                  |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --cc extensions/Exporters/TabbloExport/Makefile.am
index 23fe482,acf2d24..14a8aaa
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@@ -53,8 -49,8 +53,8 @@@ all: $(PLUGIN_ASSEMBLY
  mpack: $(PLUGIN_ASSEMBLY)
  	mautil p $(PLUGIN_ASSEMBLY)
  
- $(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT)
 -$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
 -	$(MAKE) -C $(SUBDIR)
++$(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT) $(PLUGIN_MANIFEST)
 +	$(MAKE) -C $(SUBDIRS)
  	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
  
  plugindir = $(pkglibdir)/extensions