[gnome-keyring: 2/2] Merge branch 'hard-code-config'

[Stefan Walter <stefw src gnome org>]

commit 077170f8eb5937809d229fccfd1ce286edc3766e
Merge: c4fa069 9ba7ec4
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Mar 1 10:19:10 2011 +0100

    Merge branch 'hard-code-config'

 gcr/Makefile.am                     |    9 -------
 gcr/gcr-library.c                   |   44 ++++++++---------------------------
 gcr/pkcs11-options.defaults         |   13 ----------
 gcr/tests/Makefile.am               |    1 -
 gcr/tests/test-certificate-chain.c  |    3 --
 gcr/tests/test-certificate.c        |    3 --
 gcr/tests/test-pkcs11-certificate.c |    3 --
 gcr/tests/test-simple-certificate.c |    3 --
 gcr/tests/test-trust.c              |    3 --
 gcr/tests/unit-test-parser.c        |    3 --
 10 files changed, 10 insertions(+), 75 deletions(-)
---