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)
commitacf7530a3ed55f15f6275f0419ef4347f8eb6f6c
treedf304d46f2a8c817ed3f6cbe2a7f05229ecac4c0
parent091dd0cc58ea54c71bdef2e5804cf21095b342d5
parentc61be45084d04b1db792b7e232f5bd77099f3287
Merge commit 'c61be45084d04b1db792b7e232f5bd77099f3287'

Conflicts:
libguile/ports.c