auto merge of #14234 : alexcrichton/rust/rollup, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 15 May 2014 22:56:54 +0000 (15:56 -0700)

committer bors <bors@rust-lang.org>

Thu, 15 May 2014 22:56:54 +0000 (15:56 -0700)
author bors <bors@rust-lang.org>
Thu, 15 May 2014 22:56:54 +0000 (15:56 -0700)
committer bors <bors@rust-lang.org>
Thu, 15 May 2014 22:56:54 +0000 (15:56 -0700)
diff --cc src/librustc/driver/config.rs
Simple merge
diff --cc src/librustc/driver/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 15 May 2014 22:56:54 +0000 (15:56 -0700)
committer	bors <bors@rust-lang.org>
	Thu, 15 May 2014 22:56:54 +0000 (15:56 -0700)
		1	2
src/librustc/driver/config.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/driver/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history