Merge commit 'feccd2d3100fd2964d4c2df58ab3da7ce4949a66' into vm-check

author Andy Wingo <wingo@oblong.net>

Tue, 17 Mar 2009 15:09:41 +0000 (16:09 +0100)

committer Andy Wingo <wingo@oblong.net>

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