Merge commit 'e092357058850a6f998bf462bdc5504c6379c96f' into vm-check

author Andy Wingo <wingo@oblong.net>

Tue, 17 Mar 2009 15:10:14 +0000 (16:10 +0100)

committer Andy Wingo <wingo@oblong.net>

Tue, 17 Mar 2009 15:10:14 +0000 (16:10 +0100)
author Andy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 15:10:14 +0000 (16:10 +0100)
committer Andy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 15:10:14 +0000 (16:10 +0100)
diff --cc libguile/init.c
Simple merge
diff --cc libguile/procs.c
Simple merge
author	Andy Wingo <wingo@oblong.net>
	Tue, 17 Mar 2009 15:10:14 +0000 (16:10 +0100)
committer	Andy Wingo <wingo@oblong.net>
	Tue, 17 Mar 2009 15:10:14 +0000 (16:10 +0100)
		1	2
libguile/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/procs.c	patch \|	diff1 \|	diff2 \|	blob \| history