Merge commit '1cd63115be7a25d0ea18aaa0e1eff5658d8db77a'
authorAndy Wingo <wingo@pobox.com>
Thu, 26 Apr 2012 21:08:14 +0000 (23:08 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 26 Apr 2012 21:08:14 +0000 (23:08 +0200)
commit79d29f96c7c4631ec8096d88cbd86498f004162f
tree3cbe9c94b29c1cce72404ed23cdf640ed253f8d0
parentc46e0a8a598a16b8f68b5492a13e4032b93f21f9
parent1cd63115be7a25d0ea18aaa0e1eff5658d8db77a
Merge commit '1cd63115be7a25d0ea18aaa0e1eff5658d8db77a'

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