[f-spot: 5/5] Merge commit 'gitorious/degnomifying_metapixel_picturetile'

[Ruben Vermeersch <rubenv src gnome org>]

commit 0ce813c04c5920d41e66da78fb23236b0e302a91
Merge: c068f22... 9e5bac6...
Author: Ruben Vermeersch <ruben savanne be>
Date:   Thu May 28 23:12:34 2009 +0200

    Merge commit 'gitorious/degnomifying_metapixel_picturetile'

 extensions/Tools/MetaPixel/Makefile                |    4 +-
 extensions/Tools/MetaPixel/MetaPixel.addin.xml     |    2 +-
 extensions/Tools/MetaPixel/MetaPixel.cs            |   38 +++++++++++--------
 extensions/Tools/PictureTile/Makefile              |    4 +-
 extensions/Tools/PictureTile/PictureTile.addin.xml |    2 +-
 extensions/Tools/PictureTile/PictureTile.cs        |    9 +++--
 po/POTFILES.in                                     |    4 ++
 7 files changed, 38 insertions(+), 25 deletions(-)