Merge commit 'a7bbba05838cabe2294f498e7008e1c51db6d664'

author Andy Wingo <wingo@pobox.com>

Thu, 22 Jan 2015 12:04:11 +0000 (13:04 +0100)

committer Andy Wingo <wingo@pobox.com>

Thu, 22 Jan 2015 12:04:11 +0000 (13:04 +0100)
author Andy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:04:11 +0000 (13:04 +0100)
committer Andy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:04:11 +0000 (13:04 +0100)
diff --cc configure.ac
Simple merge
diff --cc libguile/init.c
Simple merge
diff --cc libguile/load.c
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Thu, 22 Jan 2015 12:04:11 +0000 (13:04 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Thu, 22 Jan 2015 12:04:11 +0000 (13:04 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/load.c	patch \|	diff1 \|	diff2 \|	blob \| history