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

author Andy Wingo <wingo@pobox.com>

Fri, 11 May 2012 12:31:17 +0000 (14:31 +0200)

committer Andy Wingo <wingo@pobox.com>

Fri, 11 May 2012 12:31:17 +0000 (14:31 +0200)
author Andy Wingo <wingo@pobox.com>
Fri, 11 May 2012 12:31:17 +0000 (14:31 +0200)
committer Andy Wingo <wingo@pobox.com>
Fri, 11 May 2012 12:31:17 +0000 (14:31 +0200)
diff --cc libguile/frames.c
Simple merge
diff --cc libguile/stacks.c
Simple merge
diff --cc module/ice-9/boot-9.scm
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Fri, 11 May 2012 12:31:17 +0000 (14:31 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Fri, 11 May 2012 12:31:17 +0000 (14:31 +0200)
		1	2
libguile/frames.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/stacks.c	patch \|	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	patch \|	diff1 \|	diff2 \|	blob \| history