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

author Andy Wingo <wingo@pobox.com>

Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)

committer Andy Wingo <wingo@pobox.com>

Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
author Andy Wingo <wingo@pobox.com>
Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
committer Andy Wingo <wingo@pobox.com>
Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
diff --cc libguile/numbers.c
Simple merge
diff --cc libguile/programs.c
Simple merge
diff --cc libguile/programs.h
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
		1	2
libguile/numbers.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/programs.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/programs.h	patch \|	diff1 \|	diff2 \|	blob \| history