[tracker/tracker-store-queue: 13/13] Merge branch 'tracker-store' into tracker-store-queue

[Philip Van Hoof <pvanhoof src gnome org>]

commit e6dcb8e8205377dc2925d1612c6e17b2ad2eb1d5
Merge: d07d089... 4d9f576...
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed May 27 17:04:47 2009 +0200

    Merge branch 'tracker-store' into tracker-store-queue
    
    Conflicts:
    	src/tracker-indexer/tracker-indexer.c
    	src/tracker-indexer/tracker-indexer.h
    	src/tracker-indexer/tracker-removable-device.c
    	src/tracker-store/Makefile.am
    	src/tracker-store/tracker-resources.c
    	src/tracker-store/tracker-store.c
    	src/tracker-store/tracker-store.h

 .../libtracker-common-sections.txt                 |    1 -
 src/libtracker-common/tracker-utils.c              |   21 --
 src/libtracker-common/tracker-utils.h              |    1 -
 src/libtracker-data/tracker-data-update.h          |    4 -
 src/libtracker/tracker.c                           |   53 ++++-
 src/libtracker/tracker.h                           |    2 +
 src/tracker-extract/tracker-extract-libxine.c      |    6 +-
 src/tracker-indexer/tracker-indexer.c              |   21 +-
 src/tracker-indexer/tracker-indexer.h              |    1 -
 src/tracker-indexer/tracker-module-metadata.c      |   55 ++++-
 src/tracker-indexer/tracker-removable-device.c     |  186 +++++++++++
 src/tracker-store/Makefile.am                      |    4 +-
 src/tracker-store/tracker-resources.c              |   52 ++--
 src/tracker-store/tracker-store.c                  |  321 ++++++++------------
 src/tracker-store/tracker-store.h                  |   27 +--
 15 files changed, 461 insertions(+), 294 deletions(-)