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

[Stefan Walter <stefw src gnome org>]

commit 67d57140601c00227704dcb4fb90901954c0816e
Merge: 60c77d9 a4f19ca
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Apr 5 18:30:36 2011 +0200

    Merge branch 'gnome-3-0'

 NEWS                                |   10 ++++++++++
 configure.in                        |    2 +-
 docs/reference/gck/Makefile.am      |    2 +-
 docs/reference/gcr/Makefile.am      |    2 +-
 egg/egg-asn1x.c                     |    5 ++++-
 gcr/gcr-display-view.c              |    2 +-
 gcr/gcr-parser.c                    |    2 +-
 pkcs11/rpc-layer/gkm-rpc-dispatch.c |    2 +-
 pkcs11/wrap-layer/gkm-wrap-prompt.c |    2 +-
 pkcs11/xdg-store/gkm-xdg-trust.c    |    2 +-
 ui/Makefile.am                      |    4 +---
 ui/gku-prompt-tool.c                |    2 +-
 ui/gku-prompt.c                     |    2 +-
 13 files changed, 25 insertions(+), 14 deletions(-)
---