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)
commitfcd953f6990a813a204beea6992bc4287bb94513
treee12e77fa0b58fb688286a2671bcee1ba18b6bf6f
parent5dfafc3c76b70acfdb7d47611478d1f9a737ac18
parentd364a8971828e38e8f9112b711066f4962bb400e
Merge commit 'd364a8971828e38e8f9112b711066f4962bb400e'

Conflicts:
libguile/deprecated.h
libguile/gc.c
libguile/gc.c
libguile/gc.h