Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Mon, 9 Jan 2012 23:41:42 +0000 (00:41 +0100)
committerAndy Wingo <wingo@pobox.com>
Mon, 9 Jan 2012 23:41:42 +0000 (00:41 +0100)
commit91ee7515da0bad91330ce5c87b250d6cf12a2789
treece023c92c0d9bf895c1265b107b270c35ba59b94
parent0bdd43515eb3c62839512181cf33e5aea383e661
parent0e947e1d14597651c5762a4209225c472bdaef45
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/__scm.h
libguile/array-map.c
libguile/procprop.c
libguile/tags.h
module/ice-9/deprecated.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
22 files changed:
libguile/Makefile.am
libguile/__scm.h
libguile/array-map.c
libguile/arrays.c
libguile/backtrace.c
libguile/bitvectors.c
libguile/eq.c
libguile/evalext.c
libguile/fports.c
libguile/goops.c
libguile/load.c
libguile/objcodes.c
libguile/print.c
libguile/strings.c
libguile/strings.h
libguile/tags.h
libguile/threads.c
module/ice-9/boot-9.scm
module/language/tree-il/fix-letrec.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
test-suite/tests/syntax.test