Merge remote-tracking branch 'local-2.0/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Fri, 17 Jun 2011 22:45:19 +0000 (00:45 +0200)
committerAndy Wingo <wingo@pobox.com>
Fri, 17 Jun 2011 23:07:20 +0000 (01:07 +0200)
commit78f0ef20a77dd745a8fa4c1ac1fae4d42b481adf
tree3345f81ef4b52c46898deb998d365fca563f90b9
parent25711fa4caf815ffdf6000045534b2bf8f73740b
parentc245d16a5b18afdb68356f8343e6af7b3c32935b
Merge remote-tracking branch 'local-2.0/stable-2.0'

Conflicts:
module/ice-9/psyntax-pp.scm
module/language/tree-il/compile-glil.scm
configure.ac
libguile/strings.c
module/ice-9/boot-9.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
module/language/tree-il/compile-glil.scm
module/language/tree-il/primitives.scm
test-suite/tests/tree-il.test