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

[Stefan Walter <stefw src gnome org>]

commit 06d89c6e2578655b7380c6c47a27ed2cd3e48897
Merge: 8008e3f 6bd797c
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Jun 7 16:38:26 2011 +0000

    Merge branch 'gnome-3-0'

 configure.ac                     |    1 +
 daemon/gkd-main.c                |    2 +-
 daemon/gpg-agent/gkd-gpg-agent.c |    2 +-
 daemon/ssh-agent/gkd-ssh-agent.c |    2 +-
 pkcs11/gkm/gkm-data-der.c        |    4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)
---