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

[Stephane Delcroix <sdelcroix src gnome org>]

commit fa77ac5809f32c5ac1228d9dd4f3003d7ed7ef49
Merge: a41352f... 0689476...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Tue Aug 11 13:07:26 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 extensions/Exporters/CDExport/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc extensions/Exporters/CDExport/Makefile.am
index 6bd4fb4,8c93ce2..f0a97ea
--- a/extensions/Exporters/CDExport/Makefile.am
+++ b/extensions/Exporters/CDExport/Makefile.am
@@@ -16,8 -16,9 +16,8 @@@ REFS =					
  	$(LINK_MONO_ADDINS)			\
  	$(LINK_SEMWEB)				\
  	$(LINK_GPHOTO2)				\
- 	$(LINK_GTKSHARPBEANS)			\	
+ 	$(LINK_GTKSHARPBEANS)			\
  	$(LINK_GIOSHARP)			\
 -	$(LINK_DBUS)				\
  	-r:Mono.Posix
  
  PKGS =					\