Merge remote-tracking branch 'local-2.0/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Sun, 11 Mar 2012 10:06:14 +0000 (11:06 +0100)
committerAndy Wingo <wingo@pobox.com>
Sun, 11 Mar 2012 10:06:14 +0000 (11:06 +0100)
commit8b49b6b1f5522dfbb78c9249cf219a29264df490
tree0af376e25d46d4edf9023b64957817012de0f890
parente0dc497832fbd175538bfe60b468fcb43c49aaae
parent02360ed6050833d5436ea4f1b9b4f10f3783491b
Merge remote-tracking branch 'local-2.0/stable-2.0'

Conflicts:
configure.ac
configure.ac
libguile/gc.c