[f-spot/replace-import: 3/5] Merge branch 'master' into replace-import

[Ruben Vermeersch <rubenv src gnome org>]

commit 26e920ab0e0b9145bc1c95ba9444e40f9e77884c
Merge: 7654499 c49590f
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat Jun 5 16:51:52 2010 +0200

    Merge branch 'master' into replace-import

 src/ColorAdjustment/Adjustment.cs |    1 -
 src/ControlOverlay.cs             |    1 -
 src/Fader.cs                      |    1 -
 src/Imaging/PngFile.cs            |   37 +++----------------------------------
 src/Imaging/PnmFile.cs            |   19 -------------------
 src/Imaging/Tiff.cs               |    8 --------
 src/InternalProcess.cs            |    8 --------
 src/Loupe.cs                      |    1 -
 src/MetadataStore.cs              |    1 -
 src/PhotoImageView.cs             |    1 -
 src/PhotoQuery.cs                 |    1 -
 src/PhotoView.cs                  |   19 -------------------
 src/PixbufUtils.cs                |    1 -
 src/QueuedSqliteDatabase.cs       |    3 ---
 src/RotateCommand.cs              |   10 ----------
 src/SendEmail.cs                  |    4 ----
 src/TagSelectionWidget.cs         |    7 -------
 src/UI.Dialog/ProgressDialog.cs   |    2 --
 src/UriCollection.cs              |    2 --
 src/Vector.cs                     |    5 -----
 src/Widgets/CompositeUtils.cs     |    3 ---
 src/Widgets/FindBar.cs            |   10 ----------
 src/Widgets/FolderTreeView.cs     |    9 ---------
 src/Widgets/IconView.cs           |   10 ----------
 src/Widgets/ImageDisplay.cs       |    3 ---
 src/Widgets/PanZoom.cs            |    1 -
 src/Widgets/PreviewPopup.cs       |    1 -
 27 files changed, 3 insertions(+), 166 deletions(-)
---