Merge commit '6290d3f10927f887102a164ccb1a7291cc62288d' into vm-check

author Andy Wingo <wingo@oblong.net>

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

committer Andy Wingo <wingo@oblong.net>

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