Merge commit '2437c7b2e8b4ab7786847ee1ce0b59e446a70fe2'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:03:58 +0000 (16:03 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:03:58 +0000 (16:03 +0100)
commit6683f204ba95321f2cf904d0508117b027f2f2fc
treebf79cb1a9d3f3a4f8a787b39cb21165f832c89dd
parentf76cf73a49e0219f81a2fa0fc8431a0b83280822
parent2437c7b2e8b4ab7786847ee1ce0b59e446a70fe2
Merge commit '2437c7b2e8b4ab7786847ee1ce0b59e446a70fe2'

Conflicts:
libguile/guardians.c
libguile/guardians.c