[gnome-keyring: 5/8] Merge branch 'master' into gpg-agent

[Stefan Walter <stefw src gnome org>]

commit 83f3fe1a8016231f5f6a30bee3017eeb53511c58
Merge: 24528a0 e258971
Author: Stef Walter <stef memberwebs com>
Date:   Sun Jun 13 01:52:02 2010 +0000

    Merge branch 'master' into gpg-agent

 pkcs11/gkm/gkm-certificate.c                |    6 ++--
 pkcs11/gkm/gkm-certificate.h                |    1 +
 pkcs11/gkm/gkm-credential.c                 |    4 +-
 pkcs11/gkm/gkm-manager.c                    |   33 ++++++++++++++++----------
 pkcs11/gkm/gkm-manager.h                    |    5 ++++
 pkcs11/gkm/gkm-session.c                    |    4 +-
 pkcs11/roots-store/gkm-roots-certificate.c  |    2 +-
 pkcs11/secret-store/gkm-secret-collection.c |   13 ++++++----
 pkcs11/secret-store/gkm-secret-collection.h |    3 +-
 pkcs11/secret-store/gkm-secret-item.c       |    6 ++--
 pkcs11/secret-store/gkm-secret-search.c     |    8 +++---
 ui/gku-prompt-tool.c                        |   20 ++++++++--------
 ui/gku-prompt.c                             |   14 +++++-----
 13 files changed, 68 insertions(+), 51 deletions(-)
---