[grilo-plugins/debian: 18/20] Merge commit 'grilo-plugins-0.1.17' into debian

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

commit 6f90afaa963fa67dd3716f19574f6bb2d504ec55
Merge: 479986e 3e4a087
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon Sep 5 14:02:41 2011 +0200

    Merge commit 'grilo-plugins-0.1.17' into debian
    
    Conflicts resolved:
    	configure.ac

 AUTHORS                                          |    1 +
 NEWS                                             |   39 ++
 configure.ac                                     |   84 +++--
 src/media/Makefile.am                            |    6 +-
 src/media/apple-trailers/Makefile.am             |    4 +-
 src/media/bliptv/Makefile.am                     |   39 ++
 src/media/bliptv/grl-bliptv.c                    |  479 ++++++++++++++++++++++
 src/media/bliptv/grl-bliptv.h                    |   79 ++++
 src/media/bliptv/grl-bliptv.xml                  |   10 +
 src/media/bookmarks/Makefile.am                  |    4 +-
 src/media/bookmarks/grl-bookmarks.c              |    2 -
 src/media/filesystem/Makefile.am                 |    4 +-
 src/media/flickr/Makefile.am                     |    4 +-
 src/media/jamendo/Makefile.am                    |    4 +-
 src/media/podcasts/Makefile.am                   |    4 +-
 src/media/shoutcast/Makefile.am                  |    5 +-
 src/media/tracker/Makefile.am                    |    7 +-
 src/media/tracker/grl-tracker-media-api.c        |    2 -
 src/media/tracker/grl-tracker-utils.c            |    7 +-
 src/media/upnp/Makefile.am                       |    4 +-
 src/media/vimeo/Makefile.am                      |   10 +-
 src/media/youtube/Makefile.am                    |    4 +-
 src/media/youtube/grl-youtube.c                  |  168 +++++---
 src/metadata/fake-metadata/Makefile.am           |    4 +-
 src/metadata/gravatar/Makefile.am                |    4 +-
 src/metadata/lastfm-albumart/Makefile.am         |    4 +-
 src/metadata/local-metadata/Makefile.am          |    4 +-
 src/metadata/local-metadata/grl-local-metadata.c |    1 +
 src/metadata/metadata-store/Makefile.am          |    4 +-
 29 files changed, 850 insertions(+), 141 deletions(-)
---