merge from guile master
authorAndy Wingo <wingo@pobox.com>
Tue, 26 Aug 2008 19:51:19 +0000 (12:51 -0700)
committerAndy Wingo <wingo@pobox.com>
Tue, 26 Aug 2008 19:51:19 +0000 (12:51 -0700)
commitfdc0a82263cb3793cb92d802431162a50f12674c
treef0911bbf8fc1f4d4b6d42ea89397f689135fe04a
parentce66d60be23a0b151b6471896d3727601173907a
parent582a4997abc8b34ac6caf374fda8ea3ac65bd571
merge from guile master

Had to fix up .gitignore for some conflicts.
.gitignore
Makefile.am
configure.in
doc/Makefile.am
libguile/Makefile.am