[gnome-keyring/dbus-api: 5/5] Merge branch 'master' into dbus-api

[Stefan Walter <stefw src gnome org>]

commit 1286e3c553b3e03ca2b0fbb4cdcafa9cf06e6861
Merge: 9e37d22... 1c6fc47...
Author: Stef Walter <stef memberwebs com>
Date:   Sat Oct 10 15:06:42 2009 +0000

    Merge branch 'master' into dbus-api

 daemon/gkr-daemon.c                  |   19 +++++++++++++------
 pkcs11/gck/gck-module.c              |    4 ++--
 pkcs11/pkcs11g.h                     |    6 +++---
 pkcs11/pkcs11i.h                     |    8 ++++----
 pkcs11/ssh-agent/gck-ssh-agent-ops.c |   10 ++++++++++
 5 files changed, 32 insertions(+), 15 deletions(-)
---