Merge remote-tracking branch 'local-2.0/stable-2.0'

author Andy Wingo <wingo@pobox.com>

Thu, 16 Jun 2011 18:01:56 +0000 (20:01 +0200)

committer Andy Wingo <wingo@pobox.com>

Thu, 16 Jun 2011 18:01:56 +0000 (20:01 +0200)
author Andy Wingo <wingo@pobox.com>
Thu, 16 Jun 2011 18:01:56 +0000 (20:01 +0200)
committer Andy Wingo <wingo@pobox.com>
Thu, 16 Jun 2011 18:01:56 +0000 (20:01 +0200)
diff --cc libguile/objcodes.c
Simple merge
diff --cc libguile/threads.c
Simple merge
diff --cc libguile/threads.h
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Thu, 16 Jun 2011 18:01:56 +0000 (20:01 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Thu, 16 Jun 2011 18:01:56 +0000 (20:01 +0200)
		1	2
libguile/objcodes.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/threads.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/threads.h	patch \|	diff1 \|	diff2 \|	blob \| history