Merge commit '122f24cc8a3637ed42d7792ad1ff8ec0c49c58df'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:39:01 +0000 (14:39 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:39:01 +0000 (14:39 +0100)
commite140d85d5346f6cc3bd8b9f3954b063e159a2708
treebaad331e9d022640a2ee0f0ce990fbe43d5b60c1
parentc9647bfb7e780d65969d77db75576533e3e4470a
parent122f24cc8a3637ed42d7792ad1ff8ec0c49c58df
Merge commit '122f24cc8a3637ed42d7792ad1ff8ec0c49c58df'

Conflicts:
libguile/fports.c
libguile/ports.c
doc/ref/posix.texi
libguile/fports.c
libguile/ports.c
libguile/ports.h
test-suite/tests/ports.test