[tracker: 6/6] Merge branch 'music-album-domain-index'

[Martyn James Russell <mr src gnome org>]

commit d9ef588aab90ee85525c6172d82e3d36db59019d
Merge: 805f4cb c9dc074
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 10 16:12:03 2010 +0000

    Merge branch 'music-album-domain-index'

 data/ontologies/38-nmm.ontology                    |    7 +++++--
 data/ontologies/Indices.list                       |    6 ++++++
 .../libtracker-extract/tracker-extract-mockup.c    |    3 +++
 src/tracker-extract/tracker-extract-flac.c         |    3 +++
 src/tracker-extract/tracker-extract-gstreamer.c    |    3 +++
 src/tracker-extract/tracker-extract-gupnp-dlna.c   |    3 +++
 src/tracker-extract/tracker-extract-libxine.c      |    3 +++
 src/tracker-extract/tracker-extract-mp3.c          |    3 +++
 src/tracker-extract/tracker-extract-totem.c        |    3 +++
 src/tracker-extract/tracker-extract-vorbis.c       |    3 +++
 10 files changed, 35 insertions(+), 2 deletions(-)
---