[gnome-keyring: 6/6] Merge branch 'auto-destruct'

[Stefan Walter <stefw src gnome org>]

commit 28bf965222e58c0eae7eb76ff0143ce3b86a6fda
Merge: 92251a5... d69fdd3...
Author: Stef Walter <stef memberwebs com>
Date:   Sat Jul 18 18:35:22 2009 +0000

    Merge branch 'auto-destruct'

 pkcs11/gck/Makefile.am                      |    1 +
 pkcs11/gck/gck-attributes.c                 |   97 ++++++++++++
 pkcs11/gck/gck-attributes.h                 |    8 +
 pkcs11/gck/gck-module-ep.h                  |    4 +-
 pkcs11/gck/gck-module.c                     |   32 ++++-
 pkcs11/gck/gck-module.h                     |    6 +-
 pkcs11/gck/gck-object.c                     |  120 ++++++++++++++
 pkcs11/gck/gck-object.h                     |    8 +
 pkcs11/gck/gck-session.c                    |   32 ++++-
 pkcs11/gck/gck-session.h                    |    5 +
 pkcs11/gck/gck-timer.c                      |  225 +++++++++++++++++++++++++++
 pkcs11/gck/gck-timer.h                      |   43 +++++
 pkcs11/gck/gck-types.h                      |    1 +
 pkcs11/gck/tests/Makefile.am                |    3 +
 pkcs11/gck/tests/test-module.c              |   70 +++++++++
 pkcs11/gck/tests/test-module.h              |   41 +++++
 pkcs11/gck/tests/unit-test-attributes.c     |  125 +++++++++++++++
 pkcs11/gck/tests/unit-test-timer.c          |  159 +++++++++++++++++++
 pkcs11/pkcs11g.h                            |    6 +
 pkcs11/ssh-agent/gck-ssh-agent-ops.c        |   74 ++++++++-
 pkcs11/ssh-agent/gck-ssh-agent-standalone.c |    2 +-
 21 files changed, 1049 insertions(+), 13 deletions(-)
---