[f-spot: 3/4] Merge the infobox branch.

[Ruben Vermeersch <rubenv src gnome org>]

commit 9ff7a23c50294c45a388997b39d405072d13ddce
Merge: 6ce0d7c 57322a6
Author: Mike Gemünde <mike gemuende de>
Date:   Mon Oct 25 21:59:07 2010 +0200

    Merge the infobox branch.

 src/Clients/MainApp/FSpot.Widgets/InfoBox.cs | 1643 ++++++++++++--------------
 src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs  |    3 +-
 2 files changed, 734 insertions(+), 912 deletions(-)
---
diff --cc src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
index 643e0db,3d6ab8b..87df5f1
--- a/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
@@@ -1,33 -1,17 +1,35 @@@
 -/*
 - * FSpot.Widgets.InfoBox
 - *
 - * Author(s)
 - *  Ettore Perazzoli
 - *  Larry Ewing  <lewing novell com>
 - *  Gabriel Burt
 - *  Stephane Delcroix  <stephane delcroix org>
 - *  Ruben Vermeersch <ruben savanne be>
 - *  Mike Gemuende <mike gemuende de>
 - *
 - * This is free software. See COPYING for details.
 - */
 -
 +//
 +// InfoBox.cs
 +//
 +// Author:
 +//   Ruben Vermeersch <ruben savanne be>
 +//   Stephane Delcroix <sdelcroix novell com>
++//   Mike Gemuende <mike gemuende de>
 +//
 +// Copyright (C) 2008-2010 Novell, Inc.
 +// Copyright (C) 2008, 2010 Ruben Vermeersch
 +// Copyright (C) 2008 Stephane Delcroix
++// Copyright (C) 2010 Mike Gemuende
 +//
 +// Permission is hereby granted, free of charge, to any person obtaining
 +// a copy of this software and associated documentation files (the
 +// "Software"), to deal in the Software without restriction, including
 +// without limitation the rights to use, copy, modify, merge, publish,
 +// distribute, sublicense, and/or sell copies of the Software, and to
 +// permit persons to whom the Software is furnished to do so, subject to
 +// the following conditions:
 +//
 +// The above copyright notice and this permission notice shall be
 +// included in all copies or substantial portions of the Software.
 +//
 +// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
 +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 +//
  
  using Gtk;
  using System;