[gnome-keyring: 9/9] Merge branch 'gnome-2-26'

[Stefan Walter <stefw src gnome org>]

commit 1166aab82a8d2152ea3259d75c3ec99ae02e625a
Merge: f824505... bea1715...
Author: Stef Walter <stef memberwebs com>
Date:   Fri Jun 26 17:33:03 2009 +0000

    Merge branch 'gnome-2-26'

 .gitignore                         |    4 +++-
 configure.in                       |   11 +++++++++++
 library/gnome-keyring-socket.c     |    1 +
 pkcs11/gck/gck-crypto.c            |   13 ++++++++-----
 pkcs11/gck/gck-data-der.c          |    2 +-
 pkcs11/rpc-layer/Makefile.am       |    6 +++---
 pkcs11/ssh-store/gck-ssh-openssh.c |    3 ++-
 7 files changed, 29 insertions(+), 11 deletions(-)
---