Merge commit '5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 15:54:01 +0000 (16:54 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 15:54:01 +0000 (16:54 +0100)
commite0a00fe7e400aeb4d4314af410d43aea706cef62
tree9dd6e1cc2be18f31baeaad2c9665d7cbf1e2723f
parent8051cf23044e5dbbece0d328102197a04ce5718d
parent5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2
Merge commit '5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2'

Conflicts:
libguile/vectors.c
libguile/vectors.c