Merge commit '3d51e57cfb0404db568a6adfde2a346d3fd9907e'
authorAndy Wingo <wingo@pobox.com>
Mon, 30 Jan 2012 17:52:46 +0000 (18:52 +0100)
committerAndy Wingo <wingo@pobox.com>
Mon, 30 Jan 2012 17:52:46 +0000 (18:52 +0100)
Conflicts:
libguile/foreign.c
libguile/hashtab.c
module/ice-9/psyntax-pp.scm
module/language/tree-il/compile-glil.scm


No differences found