[gnome-keyring: 10/10] Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

commit 2a45c4bc0bb500d6e33f237d73568671a01c4d64
Merge: 1cfa84f 433e014
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Apr 21 09:37:58 2011 +0200

    Merge branch 'gnome-3-0'

 .gitignore                         |    1 +
 configure.in                       |    3 +++
 egg/egg-hkdf.c                     |    4 ++--
 egg/tests/Makefile.am              |    1 +
 gck/gck-slot.c                     |    3 ---
 gck/tests/Makefile.am              |    2 +-
 gcr/tests/Makefile.am              |    2 +-
 gcr/tests/frob-certificate.c       |    2 +-
 gcr/tests/frob-key.c               |    2 +-
 gcr/tests/test-parser.c            |   11 ++++++++---
 pkcs11/gkm/gkm-attributes.c        |    3 ---
 pkcs11/gkm/gkm-null-mechanism.c    |    4 ----
 pkcs11/rpc-layer/gkm-rpc-private.h |    2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)
---