Merge commit 'c61be45084d04b1db792b7e232f5bd77099f3287'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 13:47:38 +0000 (14:47 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 13:47:38 +0000 (14:47 +0100)
Conflicts:
libguile/ports.c


Trivial merge