[f-spot: 3/3] Merge in the Hyena branch.

[Ruben Vermeersch <rubenv src gnome org>]

commit beb2aee05b0d5fc84de8f258958c1656a6a1ae8c
Merge: a6fb912 70c573c
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat May 29 10:17:22 2010 +0200

    Merge in the Hyena branch.
    
    We now build and ship an embedded Hyena dll. Still to do is to make this
    optional to be able to depend on the system copy of Hyena. Embedding is
    currently done using a submodule, which is automatically pulled in when
    building.

 .gitignore                         |    2 +
 .gitmodules                        |    3 +
 autogen.sh                         |    1 +
 build/DllMapVerifier.cs            |  258 ++++++++++++++++++++++++++++++++++++
 build/Makefile.am                  |   15 ++
 build/build.environment.mk         |   21 +++
 build/build.mk                     |    3 +
 build/build.rules.mk               |   91 +++++++++++++
 build/dll-map-makefile-verifier    |   10 ++
 build/m4/f-spot/gtk-sharp.m4       |   23 +++
 build/private-icon-theme-installer |   23 +++
 configure.ac                       |    8 +-
 lib/Hyena                          |    1 +
 lib/Makefile.am                    |    4 +
 src/f-spot.in                      |    2 +-
 15 files changed, 463 insertions(+), 2 deletions(-)
---