From: Andy Wingo <wingo@pobox.com>
Date: Tue, 30 Sep 2008 19:12:16 +0000 (+0200)
Subject: Merge commit 'origin/master' into vm
X-Git-Url: http://git.hcoop.net/bpt/guile.git/commitdiff_plain/999f1b26e74a7a8eb9e9e5e479f971e145aa7326?hp=999f1b26e74a7a8eb9e9e5e479f971e145aa7326

Merge commit 'origin/master' into vm

Conflicts:

	doc/Makefile.am
	ice-9/Makefile.am
	libguile/gc.c
---