Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Mon, 25 Jul 2011 16:26:37 +0000 (18:26 +0200)
committerAndy Wingo <wingo@pobox.com>
Mon, 25 Jul 2011 16:26:37 +0000 (18:26 +0200)
Conflicts:
GUILE-VERSION
test-suite/tests/srfi-4.test

1  2 
.gitignore
GUILE-VERSION
configure.ac
libguile/bytevectors.c
libguile/goops.c
libguile/read.c
libguile/threads.c
module/ice-9/boot-9.scm
module/oop/goops.scm

diff --cc .gitignore
Simple merge
diff --cc GUILE-VERSION
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
diff --cc libguile/read.c
Simple merge
Simple merge
Simple merge
Simple merge