[tracker: 13/13] Merge branch 'gstreamer-with-dlna'

[Martyn James Russell <mr src gnome org>]

commit 3728fb6976f52451d62af14853c36d62b42bc051
Merge: c1aa8cc 4028a7a
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Aug 2 13:19:58 2011 +0100

    Merge branch 'gstreamer-with-dlna'

 configure.ac                                       |  196 ++--
 src/tracker-extract/16-upnp-guess.rule.in          |    4 -
 .../91-gstreamer-generic-dlna.rule.in              |    4 +
 src/tracker-extract/91-upnp-generic.rule.in        |    4 -
 src/tracker-extract/Makefile.am                    |   33 +-
 src/tracker-extract/tracker-extract-gstreamer.c    | 1101 +++++++++++++-------
 6 files changed, 838 insertions(+), 504 deletions(-)
---