[gnome-keyring: 2/2] Merge branch 'display-hex'

[Stefan Walter <stefw src gnome org>]

commit 40fb2e404ede6dc8b16dff865c3feec06ac3518f
Merge: 2468d94 e037705
Author: Stef Walter <stefw collabora co uk>
Date:   Tue May 24 09:33:40 2011 +0200

    Merge branch 'display-hex'

 gcr/gcr-certificate-renderer.c |   31 ++++++++-----------------------
 gcr/gcr-display-view.c         |   16 ++++++++++++----
 gcr/gcr-display-view.h         |    6 ++++++
 gcr/gcr-key-renderer.c         |    2 --
 4 files changed, 26 insertions(+), 29 deletions(-)
---