Merge commit '495cea0c931de23f074892b3f32808e676712a18'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:48:48 +0000 (14:48 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:48:48 +0000 (14:48 +0100)
commitadf06a72d53821d34e14fa69b20b10e2f809f593
tree9f9342a109a50e4291a0f57816cfd090e0fbe402
parent04023cceb7584810005906b86c876d703a0e98b5
parent495cea0c931de23f074892b3f32808e676712a18
Merge commit '495cea0c931de23f074892b3f32808e676712a18'

Conflicts:
libguile/weaks.c
libguile/weak-vector.c