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

[Stefan Walter <stefw src gnome org>]

commit afdd535fa2c8ad57cc1f14a073ac90275d2bd14e
Merge: 68551ba 5b3e79b
Author: Stef Walter <stefw collabora co uk>
Date:   Tue May 31 10:05:28 2011 +0200

    Merge branch 'gnome-3-0'

 gcr/gcr-importer.c      |   20 ++++++++++++++++----
 gcr/gcr-parser.c        |   13 ++++++++++++-
 pkcs11/gkm/gkm-module.c |   14 ++++++++++++++
 tool/gkr-tool-import.c  |    2 +-
 4 files changed, 43 insertions(+), 6 deletions(-)
---