[grilo/rpm: 11/12] Merge commit 'grilo-0.1.13' into rpm

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

commit a68d023b7bf607b71e12f2a0a758e637e7d87940
Merge: 6888347 7aec11b
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Wed Apr 6 12:31:15 2011 -0400

    Merge commit 'grilo-0.1.13' into rpm

 NEWS                        |   14 +++
 configure.ac                |    2 +-
 src/data/grl-data.c         |  217 ++++++++++++++++++++++++++-----------------
 src/data/grl-data.h         |   16 ++-
 src/data/grl-media-box.c    |    4 -
 src/data/grl-related-keys.c |   94 ++++++++-----------
 src/data/grl-related-keys.h |   11 +-
 src/grl-media-source.c      |   27 +++++-
 src/grl-metadata-source.c   |   14 ++-
 tools/grilo-test-ui/main.c  |    2 +-
 10 files changed, 234 insertions(+), 167 deletions(-)
---