[f-spot/taglib-metadata: 11/11] Merge remote branch 'origin/master' into taglib-metadata

[Ruben Vermeersch <rubenv src gnome org>]

commit 03a4a5eb0b345994b6ce23d337a7780cabeb308c
Merge: fc15ca7 fa7657d
Author: Ruben Vermeersch <ruben savanne be>
Date:   Thu Jul 1 11:19:30 2010 +0200

    Merge remote branch 'origin/master' into taglib-metadata

 lib/libfspot/Makefile.am                       |    2 +
 lib/libjpegtran/Makefile.am                    |    1 +
 po/de.po                                       |  825 ++++++++++++------------
 po/sl.po                                       |  822 ++++++++++++------------
 src/Db.cs                                      |   19 +-
 src/MainWindow.cs                              |    2 +
 src/PhotoView.cs                               |    3 +-
 src/SingleView.cs                              |   10 +-
 src/UI.Dialog/ui/LastImportRollFilterDialog.ui |    8 +-
 src/Widgets/Sidebar.cs                         |    4 -
 src/Widgets/TagView.cs                         |   23 +-
 11 files changed, 873 insertions(+), 846 deletions(-)
---