[gnome-keyring: 3/3] Merge branch 'parse-other-names'

[Stefan Walter <stefw src gnome org>]

commit 73ac0ac4b752af59750c4dfa28448a4776339c50
Merge: 29d81c6 2ef650d
Author: Stef Walter <stefw collabora co uk>
Date:   Wed Aug 17 18:40:37 2011 +0200

    Merge branch 'parse-other-names'

 .gitignore                       |    1 +
 gcr/Makefile.am                  |    8 +++-
 gcr/gcr-certificate-extensions.c |   28 ++++++++++++-
 gcr/gcr-certificate-renderer.c   |   23 +++-------
 gcr/gcr-certificate.c            |   11 ++---
 gcr/gcr-fingerprint.c            |   31 ++------------
 gcr/gcr-mkoids                   |   85 ++++++++++++++++++++++++++++++++++++++
 gcr/gcr-oids.list                |   19 ++++++++
 gcr/gcr-parser.c                 |   57 ++++++++-----------------
 9 files changed, 174 insertions(+), 89 deletions(-)
---