Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	GUILE-VERSION

diff --cc .gitignore
Simple merge

diff --cc GUILE-VERSION
index 71237e4,b31fa72..acaa566
--- 1/GUILE-VERSION
--- 2/GUILE-VERSION
+++ b/GUILE-VERSION
@@@ -18,7 -18,7 +18,7 @@@ GUILE_EFFECTIVE_VERSION=2.
  # See libtool info pages for more information on how and when to
  # change these.
  
- LIBGUILE_INTERFACE_CURRENT=24
 -LIBGUILE_INTERFACE_CURRENT=27
++LIBGUILE_INTERFACE_CURRENT=0
  LIBGUILE_INTERFACE_REVISION=0
- LIBGUILE_INTERFACE_AGE=2
 -LIBGUILE_INTERFACE_AGE=5
++LIBGUILE_INTERFACE_AGE=0
  LIBGUILE_INTERFACE="${LIBGUILE_INTERFACE_CURRENT}:${LIBGUILE_INTERFACE_REVISION}:${LIBGUILE_INTERFACE_AGE}"

diff --cc configure.ac
Simple merge

diff --cc doc/ref/srfi-modules.texi
Simple merge

diff --cc libguile/Makefile.am
Simple merge

diff --cc m4/gnulib-cache.m4
Simple merge

diff --cc module/Makefile.am
Simple merge

diff --cc module/ice-9/psyntax-pp.scm
Simple merge

diff --cc module/ice-9/psyntax.scm
Simple merge