Merge commit 'origin/master' into vm

Conflicts:

	.gitignore
	guile-tools.in
	srfi/srfi-19.scm

diff --cc .gitignore
index f5953c9,3df721c..4aeb5f6
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -68,9 -68,9 +68,11 @@@ guile-procedures.tx
  guile-config/guile-config
  guile-readline/guile-readline-config.h
  guile-readline/guile-readline-config.h.in
 +*.go
  TAGS
  guile-1.8.pc
- lib/alloca.h
- lib/strings.h
 +gdb-pre-inst-guile
+ libguile/stack-limit-calibration.scm
+ cscope.out
+ cscope.files
+ *.log

diff --cc Makefile.am
Simple merge

diff --cc configure.in
Simple merge

diff --cc doc/Makefile.am
Simple merge

diff --cc doc/ref/api-debug.texi
Simple merge

diff --cc libguile/Makefile.am
Simple merge

diff --cc libguile/goops.c
Simple merge

diff --cc libguile/goops.h
Simple merge

diff --cc libguile/threads.c
Simple merge

diff --cc module/ice-9/debugging/Makefile.am
Simple merge

diff --cc module/ice-9/gds-client.scm
Simple merge

diff --cc module/srfi/srfi-19.scm
Simple merge

diff --cc module/srfi/srfi-34.scm
Simple merge