[gnome-keyring: 22/22] Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

commit a92ba0d0f306d4eaa6bf5eb5503a7ec71afa530e
Merge: 2b2c163 eeeddb5
Author: Stef Walter <stefw collabora co uk>
Date:   Sat Mar 19 16:04:50 2011 +0100

    Merge branch 'gnome-3-0'

 NEWS                                 |   12 ++++
 daemon/dbus/gkd-secret-objects.c     |    2 +-
 daemon/dbus/gkd-secret-property.c    |   25 ++++++--
 daemon/dbus/gkd-secret-property.h    |    1 +
 daemon/dbus/gkd-secret-service.c     |    4 +-
 daemon/gpg-agent/gkd-gpg-agent-ops.c |  107 +++++++++++++++++++---------------
 gcr/Makefile.am                      |    2 +
 gcr/gcr-certificate-basics-widget.c  |   54 +++++++++++++++++
 gcr/gcr-certificate-basics-widget.h  |   62 +++++++++++++++++++
 gcr/gcr-certificate-details-widget.c |   54 +++++++++++++++++
 gcr/gcr-certificate-details-widget.h |   61 +++++++++++++++++++
 gcr/gcr-importer.c                   |   19 ++++++
 gcr/gcr-importer.h                   |    9 +++
 gcr/gcr.h                            |    7 ++
 14 files changed, 364 insertions(+), 55 deletions(-)
---