auto merge of #12490 : zslayton/rust/doc-fix-12386, r=alexcrichton

author bors <bors@rust-lang.org>

Wed, 26 Feb 2014 18:46:36 +0000 (10:46 -0800)

committer bors <bors@rust-lang.org>

Wed, 26 Feb 2014 18:46:36 +0000 (10:46 -0800)
author bors <bors@rust-lang.org>
Wed, 26 Feb 2014 18:46:36 +0000 (10:46 -0800)
committer bors <bors@rust-lang.org>
Wed, 26 Feb 2014 18:46:36 +0000 (10:46 -0800)
diff --cc src/libstd/io/mod.rs
Simple merge
diff --cc src/libstd/io/test.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 26 Feb 2014 18:46:36 +0000 (10:46 -0800)
committer	bors <bors@rust-lang.org>
	Wed, 26 Feb 2014 18:46:36 +0000 (10:46 -0800)
		1	2
src/libstd/io/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/io/test.rs	patch \|	diff1 \|	diff2 \|	blob \| history