[tracker: 10/10] Merge remote branch 'origin/removable-opticals'

[Aleksander Morgado <aleksm src gnome org>]

commit 59dd6950484f05f0fa9d9d28d5e5d5c95aa8da2b
Merge: 53edd23 0af92d3
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Thu Jun 17 17:35:59 2010 +0200

    Merge remote branch 'origin/removable-opticals'

 data/ontologies/90-tracker.ontology                |   10 +
 .../libtracker-miner/libtracker-miner-sections.txt |    4 +
 src/libtracker-miner/tracker-miner-fs.c            |   40 ++-
 src/libtracker-miner/tracker-miner-fs.h            |    3 +-
 src/libtracker-miner/tracker-storage.c             |   42 ++-
 src/libtracker-miner/tracker-storage.h             |   64 +++-
 src/miners/fs/tracker-miner-files.c                |  407 +++++++++++++++++---
 7 files changed, 485 insertions(+), 85 deletions(-)
---