Merge commit '8b0174c879bf74981efe702a00471ed5b8e6912e' into vm-check

author Andy Wingo <wingo@oblong.net>

Tue, 17 Mar 2009 14:52:41 +0000 (15:52 +0100)

committer Andy Wingo <wingo@oblong.net>

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