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

[Stephane Delcroix <sdelcroix src gnome org>]

commit 800a38188ab01c6db9cef124befa1ab1fe758e87
Merge: 73f9da2... 3caa9cb...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Fri Aug 21 16:12:31 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 configure.ac                                       |    1 +
 extensions/Tools/Makefile.am                       |    1 +
 extensions/Tools/ScreensaverConfig/Makefile.am     |   54 +++++++
 .../ScreensaverConfig/ScreensaverConfig.addin.xml  |   16 ++
 .../Tools/ScreensaverConfig/ScreensaverConfig.cs   |  131 +++++++++++++++++
 .../ScreensaverConfig/ScreensaverConfigDialog.ui   |  153 ++++++++++++++++++++
 src/Core.cs                                        |    5 +-
 src/Preferences.cs                                 |    5 -
 src/SlideView.cs                                   |    8 +-
 9 files changed, 363 insertions(+), 11 deletions(-)
---