Merge commit 'd364a8971828e38e8f9112b711066f4962bb400e'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:16:48 +0000 (16:16 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:16:48 +0000 (16:16 +0100)
Conflicts:
libguile/deprecated.h
libguile/gc.c

1  2 
libguile/gc.c
libguile/gc.h

diff --cc libguile/gc.c
Simple merge
diff --cc libguile/gc.h
Simple merge