Merge branch 'master' into boehm-demers-weiser-gc
authorLudovic Courtès <ludo@gnu.org>
Sat, 17 Jan 2009 21:37:13 +0000 (22:37 +0100)
committerLudovic Courtès <ludo@gnu.org>
Sat, 17 Jan 2009 21:44:05 +0000 (22:44 +0100)
commit2b807ea75c9a4dc3059918d2d04e1cb3ed301acf
treefcd59c097ff229adc105c505d876375d67cdb472
parentc501d037b6a5b6953edd6a1da38b0d8e80ad4c7e
parent9ffef3c6f621bd4de70a0eb0dae4bb96c6026a79
Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
lib/Makefile.am
m4/gnulib-cache.m4
m4/gnulib-comp.m4
configure.in
lib/Makefile.am
libguile/goops.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4