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)
Conflicts:
libguile/weaks.c


No differences found