auto merge of #16986 : bjz/rust/bitflags, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 4 Sep 2014 20:21:02 +0000 (20:21 +0000)

committer bors <bors@rust-lang.org>

Thu, 4 Sep 2014 20:21:02 +0000 (20:21 +0000)
author bors <bors@rust-lang.org>
Thu, 4 Sep 2014 20:21:02 +0000 (20:21 +0000)
committer bors <bors@rust-lang.org>
Thu, 4 Sep 2014 20:21:02 +0000 (20:21 +0000)
diff --cc src/libstd/io/mod.rs
Simple merge
diff --cc src/libstd/lib.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 4 Sep 2014 20:21:02 +0000 (20:21 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 4 Sep 2014 20:21:02 +0000 (20:21 +0000)
		1	2
src/libstd/io/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history