[tracker: 4/5] Merge branch 'miner-flickr-review'

[Martyn James Russell <mr src gnome org>]

commit 9a64b1ae34fbae1a178e77d03dc115640886c837
Merge: c3edd91 ca5ef2a
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Apr 29 17:21:00 2010 +0100

    Merge branch 'miner-flickr-review'

 configure.ac                                       |   29 +
 data/dbus/Makefile.am                              |    4 +
 ...rg.freedesktop.Tracker1.Miner.Flickr.service.in |    3 +
 data/icons/scalable/Makefile.am                    |   11 +-
 data/icons/scalable/tracker-miner-flickr.svg       |  206 +++++
 data/miners/Makefile.am                            |    7 +
 data/miners/tracker-miner-flickr.desktop.in.in     |    8 +
 data/ontologies/31-nao.ontology                    |    2 +
 src/miners/Makefile.am                             |    4 +
 src/miners/flickr/Makefile.am                      |   63 ++
 src/miners/flickr/tracker-miner-flickr.vala        |  884 ++++++++++++++++++++
 11 files changed, 1220 insertions(+), 1 deletions(-)
---