Merge commit '9b5da400dde6e6bc8fd0e318e7ca1feffa5870db'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:36:06 +0000 (15:36 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:36:06 +0000 (15:36 +0100)
commit9db57a19e1204d6c458675bd8347fdfc00ecc3e8
tree96f3ffcf3574ce05861ff9df14cf060f21d7f596
parentcc620af7ca9bb7c2c841f9612fbdf97b68aaf277
parent9b5da400dde6e6bc8fd0e318e7ca1feffa5870db
Merge commit '9b5da400dde6e6bc8fd0e318e7ca1feffa5870db'

Conflicts:
libguile/vectors.c
test-suite/tests/weaks.test
libguile/vectors.c
test-suite/tests/weaks.test