[grilo/rpm: 18/19] Merge commit 'grilo-0.1.12' into rpm

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

commit b3e134061922d742ff0a047c011ecd8d299bcce1
Merge: f446279 0cba561
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Wed Mar 30 20:51:59 2011 +0200

    Merge commit 'grilo-0.1.12' into rpm

 NEWS                        |   16 ++
 configure.ac                |    8 +-
 libs/net/Makefile.am        |    7 +
 libs/net/grl-net-wc.c       |  330 ++++++++++++++++++++++++++++++++++++++++++-
 libs/net/grl-net-wc.h       |    6 +
 src/Makefile.am             |    2 +-
 src/data/grl-config.c       |    5 +-
 src/data/grl-config.h       |    4 +-
 src/data/grl-data.c         |   42 +++---
 src/data/grl-media-image.c  |  171 ++++++++++++++++++++++
 src/data/grl-media-image.h  |   33 ++++-
 src/data/grl-media.c        |   33 +++++
 src/data/grl-media.h        |    4 +
 src/data/grl-related-keys.c |   31 ++--
 src/grl-media-source.c      |    2 +
 src/grl-media-source.h      |    8 +-
 src/grl-metadata-key.c      |   65 +++++++++
 src/grl-metadata-key.h      |    6 +
 src/grl-metadata-source.c   |  170 +++++++++-------------
 src/grl-metadata-source.h   |    4 +-
 src/grl-plugin-registry.c   |    4 +-
 tools/grilo-test-ui/main.c  |   14 ++
 22 files changed, 807 insertions(+), 158 deletions(-)
---