Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Fri, 6 Jul 2012 14:52:54 +0000 (16:52 +0200)
committerAndy Wingo <wingo@pobox.com>
Fri, 6 Jul 2012 14:52:54 +0000 (16:52 +0200)
commit2aed2667fce5ccb115667a36ffd368c4c3b6e9f4
tree21c31f62bca976076b851d01104327152035e8d4
parentb8bc86bce147cf280ca2a60d36c8b6493cbf11e8
parent24dd9f6fe1449fa4de81d95ca659283c15e16931
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/expand.c
libguile/hashtab.c
libguile/ports.c
libguile/vectors.c
libguile/weaks.c
module/language/ecmascript/compile-tree-il.scm
module/language/tree-il/effects.scm
module/language/tree-il/fix-letrec.scm
module/language/tree-il/peval.scm
test-suite/tests/peval.test
29 files changed:
configure.ac
doc/ref/api-control.texi
doc/ref/vm.texi
libguile/__scm.h
libguile/deprecation.c
libguile/expand.c
libguile/filesys.c
libguile/finalizers.c
libguile/foreign.c
libguile/gen-scmconfig.c
libguile/guardians.c
libguile/numbers.c
libguile/ports.c
libguile/smob.c
libguile/struct.c
libguile/values.c
libguile/vectors.c
libguile/weak-set.c
libguile/weak-table.c
libguile/weak-vector.c
module/ice-9/eval.scm
module/ice-9/psyntax.scm
module/language/ecmascript/compile-tree-il.scm
module/language/tree-il/effects.scm
module/language/tree-il/fix-letrec.scm
module/language/tree-il/peval.scm
module/system/repl/command.scm
test-suite/tests/cse.test
test-suite/tests/peval.test