Merge commit '24cac6554073bb6e691605cd6ac6196f3c0851a3'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 16:00:32 +0000 (17:00 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 16:00:32 +0000 (17:00 +0100)
commit787f7b644fa480b4815974c9850d5707881cf9f7
treeb58acd4cce64c90802961b989dca798a6ddfe734
parente0a00fe7e400aeb4d4314af410d43aea706cef62
parent24cac6554073bb6e691605cd6ac6196f3c0851a3
Merge commit '24cac6554073bb6e691605cd6ac6196f3c0851a3'

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