Merge commit 'de1eb420a5a95b17e85b19c4d98c869036e9ecb0'
authorAndy Wingo <wingo@pobox.com>
Thu, 26 Apr 2012 20:56:45 +0000 (22:56 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 26 Apr 2012 20:56:45 +0000 (22:56 +0200)
commitc46e0a8a598a16b8f68b5492a13e4032b93f21f9
treeb57374184dc4715a32393b53866263a55ebc01b7
parente7501d4a682cc2b430514280834dfc68b97f2be2
parentde1eb420a5a95b17e85b19c4d98c869036e9ecb0
Merge commit 'de1eb420a5a95b17e85b19c4d98c869036e9ecb0'

Conflicts:
module/language/tree-il/primitives.scm
test-suite/tests/tree-il.test
module/language/tree-il/primitives.scm
test-suite/Makefile.am
test-suite/tests/peval.test
test-suite/tests/tree-il.test