Merge commit '5d971db802eaa8038db17e1aa5b4c69452739744'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:34:48 +0000 (13:34 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:34:48 +0000 (13:34 +0100)
Conflicts:
libguile/ports.c


Trivial merge