Merge branch 'key-fingerprints'

Conflicts:
	gcr/Makefile.am

diff --cc gcr/Makefile.am
index feaf18e,4695924..5196618
--- 1/gcr/Makefile.am
--- 2/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -78,10 -77,10 +78,10 @@@ libgcr@GCR_VERSION_SUFFIX@_la_SOURCES 
        gcr-certificate-widget.c gcr-certificate-widget.h \
        gcr-collection.c gcr-collection.h \
        gcr-collection-model.c gcr-collection-model.h \
 -      gcr-colons.c gcr-colons.h \
 +      gcr-combo-selector.c gcr-combo-selector.h \
+       gcr-comparable.c gcr-comparable.h \
        gcr-debug.c gcr-debug.h \
        gcr-display-scrolled.c gcr-display-scrolled.h \
-       gcr-comparable.c gcr-comparable.h \
        gcr-display-view.c gcr-display-view.h \
        gcr-gnupg-collection.c gcr-gnupg-collection.h \
        gcr-gnupg-key.c gcr-gnupg-key.h \

diff --cc gcr/tests/Makefile.am
Simple merge