[grilo/rpm: 6/7] Merge commit 'grilo-0.1.11' into rpm

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

commit f5bf9648b898e3181aec667f2e724d080852b998
Merge: 4ba3d2f 9c95a81
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Mar 17 23:01:33 2011 +0100

    Merge commit 'grilo-0.1.11' into rpm

 AUTHORS                    |    1 +
 NEWS                       |   11 ++++++
 configure.ac               |    2 +-
 src/data/grl-data.c        |    2 +-
 src/data/grl-media-video.c |   87 ++++++++++++++++++++++++++++++++++++++++++++
 src/data/grl-media-video.h |   12 ++++++
 src/grl-media-source.c     |   26 +++++++-------
 src/grl-metadata-key.c     |   33 +++++++++++++++++
 src/grl-metadata-key.h     |    3 ++
 9 files changed, 162 insertions(+), 15 deletions(-)
---