[gnome-keyring: 4/4] Merge branch 'gsettings-migration'

[Stefan Walter <stefw src gnome org>]

commit f3c08bb6f286da296d28efc7e626569f8c3b565b
Merge: 7b0231d 83dd6f1
Author: Stef Walter <stef memberwebs com>
Date:   Sat Sep 11 20:47:43 2010 +0000

    Merge branch 'gsettings-migration'

 .gitignore                                |    1 +
 Makefile.am                               |    1 +
 autogen.sh                                |    1 -
 configure.in                              |    5 ++-
 daemon/gpg-agent/gkd-gpg-agent-ops.c      |   51 +++++++++++++++++++++++++++++
 daemon/gpg-agent/gkd-gpg-agent-private.h  |    2 +
 daemon/gpg-agent/gkd-gpg-agent.c          |   21 ++++++++++++
 schema/Makefile.am                        |   17 +++++++++
 schema/org.gnome.crypto.cache.convert     |    3 ++
 schema/org.gnome.crypto.cache.gschema.xml |   19 +++++++++++
 schema/org.gnome.crypto.pgp.convert       |    6 +++
 schema/org.gnome.crypto.pgp.gschema.xml   |   29 ++++++++++++++++
 12 files changed, 154 insertions(+), 2 deletions(-)
---