Merge commit '750ac8c592e792e627444f476877f282525b132e'

Conflicts:
	.gitignore
	libguile/deprecated.c

diff --cc .gitignore
index b136c7a,064305c..12cbc32
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -156,4 -159,4 +159,5 @@@ INSTAL
  /test-suite/standalone/test-smob-mark
  /test-suite/standalone/test-scm-values
  /test-suite/standalone/test-scm-to-latin1-string
+ /test-suite/standalone/test-scm-c-bind-keyword-arguments
 +/libguile/vm-operations.h

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

diff --cc libguile/__scm.h
Simple merge

diff --cc libguile/throw.c
Simple merge

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

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