[grilo-plugins/debian: 11/12] Merge commit 'grilo-plugins-0.1.18' into debian

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit 4ab2f505fbe5160bd0ece76768171edca3ccdde4
Merge: ed13b18 a90b2b6
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Fri Dec 9 15:03:10 2011 +0000

    Merge commit 'grilo-plugins-0.1.18' into debian

 AUTHORS                                       |    1 +
 NEWS                                          |   24 +++++++++++++++++++++
 configure.ac                                  |   28 ++++++++++++++++++------
 src/media/apple-trailers/Makefile.am          |    1 +
 src/media/apple-trailers/grl-apple-trailers.c |    2 +
 src/media/bliptv/Makefile.am                  |    3 +-
 src/media/bookmarks/Makefile.am               |    1 +
 src/media/filesystem/Makefile.am              |    1 +
 src/media/flickr/Makefile.am                  |    1 +
 src/media/jamendo/Makefile.am                 |    1 +
 src/media/podcasts/Makefile.am                |    1 +
 src/media/shoutcast/Makefile.am               |    1 +
 src/media/tracker/Makefile.am                 |    1 +
 src/media/tracker/grl-tracker-media-api.c     |   27 ++++++++++++++++--------
 src/media/tracker/grl-tracker-media-priv.h    |    1 +
 src/media/tracker/grl-tracker.c               |    3 ++
 src/media/upnp/Makefile.am                    |    1 +
 src/media/upnp/grl-upnp.c                     |   21 ++++++++++--------
 src/media/vimeo/Makefile.am                   |    1 +
 src/media/youtube/Makefile.am                 |    1 +
 src/metadata/fake-metadata/Makefile.am        |    1 +
 src/metadata/gravatar/Makefile.am             |    1 +
 src/metadata/lastfm-albumart/Makefile.am      |    1 +
 src/metadata/local-metadata/Makefile.am       |    3 +-
 src/metadata/metadata-store/Makefile.am       |    1 +
 test/Makefile.am                              |    2 -
 26 files changed, 101 insertions(+), 29 deletions(-)
---