Merge branch 'master' into gck-work

diff --cc gcr/Makefile.am
index dfb5864,4a72a3c..cd1cbd4
--- 1/gcr/Makefile.am
--- 2/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -64,10 -67,10 +67,10 @@@ libgcr@GCR_VERSION_SUFFIX@_la_LDFLAGS 
        -version-info $(GCR_LT_RELEASE) \
        -no-undefined -export-symbols-regex 'gcr_*'
  
- libgcr_la_LIBADD = \
+ libgcr@GCR_VERSION_SUFFIX@_la_LIBADD = \
        $(top_builddir)/egg/libegg.la \
        $(top_builddir)/egg/libegg-entry-buffer.la \
 -      $(top_builddir)/gp11/libgp11.la \
 +      $(top_builddir)/gck/libgck.la \
        $(GOBJECT_LIBS) \
        $(GLIB_LIBS) \
        $(LIBGCRYPT_LIBS) \