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

author Mark H Weaver <mhw@netris.org>

Sat, 24 Aug 2013 02:36:02 +0000 (22:36 -0400)

committer Mark H Weaver <mhw@netris.org>

Sat, 24 Aug 2013 02:36:02 +0000 (22:36 -0400)
author Mark H Weaver <mhw@netris.org>
Sat, 24 Aug 2013 02:36:02 +0000 (22:36 -0400)
committer Mark H Weaver <mhw@netris.org>
Sat, 24 Aug 2013 02:36:02 +0000 (22:36 -0400)
diff --cc doc/ref/api-io.texi
Simple merge
diff --cc module/ice-9/boot-9.scm
Simple merge
author	Mark H Weaver <mhw@netris.org>
	Sat, 24 Aug 2013 02:36:02 +0000 (22:36 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Sat, 24 Aug 2013 02:36:02 +0000 (22:36 -0400)
		1	2
doc/ref/api-io.texi	patch \|	diff1 \|	diff2 \|	blob \| history
module/ice-9/boot-9.scm	patch \|	diff1 \|	diff2 \|	blob \| history