Merge branch 'master' into boehm-demers-weiser-gc
authorLudovic Courtès <ludo@gnu.org>
Sun, 14 Dec 2008 19:25:56 +0000 (20:25 +0100)
committerLudovic Courtès <ludo@gnu.org>
Sun, 14 Dec 2008 19:48:15 +0000 (20:48 +0100)
commit083f810fe9b7f04dc0de6b8ebc62053a41714f2b
treef36b397182a25292763bfad5bd14bdd69597327a
parentc9d15b05833feccf1cbc644ab534b9beeaa5b744
parent55aae983565cd14821d4cdff9f44afc96f8868c1
Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
lib/Makefile.am
libguile/struct.c
libguile/threads.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4
configure.in
lib/Makefile.am
libguile/Makefile.am
libguile/async.c
libguile/fports.c
libguile/ports.c
libguile/strings.c
libguile/struct.c
libguile/threads.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4