auto merge of #5350 : yichoi/rust/pull-0313-2, r=graydon,pcwalton

author bors <bors@rust-lang.org>

Wed, 20 Mar 2013 00:06:55 +0000 (17:06 -0700)

committer bors <bors@rust-lang.org>

Wed, 20 Mar 2013 00:06:55 +0000 (17:06 -0700)
author bors <bors@rust-lang.org>
Wed, 20 Mar 2013 00:06:55 +0000 (17:06 -0700)
committer bors <bors@rust-lang.org>
Wed, 20 Mar 2013 00:06:55 +0000 (17:06 -0700)
diff --cc mk/rt.mk
Simple merge
diff --cc src/librustc/driver/driver.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 20 Mar 2013 00:06:55 +0000 (17:06 -0700)
committer	bors <bors@rust-lang.org>
	Wed, 20 Mar 2013 00:06:55 +0000 (17:06 -0700)
		1	2
mk/rt.mk	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/driver/driver.rs	patch \|	diff1 \|	diff2 \|	blob \| history