Merge commit '37b1453032488de582175270d1b3a1653ea81457'

author Andy Wingo <wingo@pobox.com>

Thu, 22 Jan 2015 13:37:52 +0000 (14:37 +0100)

committer Andy Wingo <wingo@pobox.com>

Thu, 22 Jan 2015 13:37:52 +0000 (14:37 +0100)
author Andy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:37:52 +0000 (14:37 +0100)
committer Andy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:37:52 +0000 (14:37 +0100)
diff --cc libguile/fports.c
Simple merge
diff --cc test-suite/tests/ports.test
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Thu, 22 Jan 2015 13:37:52 +0000 (14:37 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Thu, 22 Jan 2015 13:37:52 +0000 (14:37 +0100)
		1	2
libguile/fports.c	patch \|	diff1 \|	diff2 \|	blob \| history
test-suite/tests/ports.test	patch \|	diff1 \|	diff2 \|	blob \| history