Merge commit '45a28515c13348dfd18e53038ad63dd091a5a3c1'

author Andy Wingo <wingo@pobox.com>

Fri, 7 Feb 2014 13:43:42 +0000 (14:43 +0100)

committer Andy Wingo <wingo@pobox.com>

Fri, 7 Feb 2014 13:43:42 +0000 (14:43 +0100)
author Andy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:43:42 +0000 (14:43 +0100)
committer Andy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:43:42 +0000 (14:43 +0100)
diff --cc libguile/r6rs-ports.c
Simple merge
diff --cc test-suite/tests/r6rs-ports.test
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Fri, 7 Feb 2014 13:43:42 +0000 (14:43 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Fri, 7 Feb 2014 13:43:42 +0000 (14:43 +0100)
		1	2
libguile/r6rs-ports.c	patch \|	diff1 \|	diff2 \|	blob \| history
test-suite/tests/r6rs-ports.test	patch \|	diff1 \|	diff2 \|	blob \| history