Merge branch 'master' into boehm-demers-weiser-gc
authorLudovic Courtès <ludo@gnu.org>
Wed, 9 Sep 2009 20:32:02 +0000 (22:32 +0200)
committerLudovic Courtès <ludo@gnu.org>
Wed, 9 Sep 2009 20:39:49 +0000 (22:39 +0200)
commit6dc797eee9041498eec7053d32d8721c3660fb51
tree27da6956712e6391c2209045e3ed69e027b63656
parentd66b74dce74c2824726746e82a8a413463cb80fd
parente354d7689aca1f6482bd90a2c367617222052265
Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
libguile/gc_os_dep.c
libguile/gc.h
libguile/load.c
libguile/ports.c
libguile/print.c
libguile/srfi-14.c
libguile/strings.c
libguile/strings.h