Merge commit 'f6ddf827f8f192af7a8cd255bd8374a0d38bbb74'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:51:42 +0000 (14:51 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 13:51:42 +0000 (14:51 +0100)
commita1aae2c3a03afc542ab6a7c6672c5a645ac77b09
treedc37d3ae3855ecc10dee96ab97eb807e830cf403
parent0dbc5e571aa3bdb73fd0b9b1631e502167c4325a
parentf6ddf827f8f192af7a8cd255bd8374a0d38bbb74
Merge commit 'f6ddf827f8f192af7a8cd255bd8374a0d38bbb74'

Conflicts:
module/ice-9/boot-9.scm
module/oop/goops.scm
doc/ref/api-macros.texi
module/ice-9/boot-9.scm
module/ice-9/poll.scm
module/oop/goops.scm
module/system/foreign.scm