auto merge of #5996 : sanxiyn/rust/target-feature, r=graydon

author bors <bors@rust-lang.org>

Tue, 23 Apr 2013 00:36:49 +0000 (17:36 -0700)

committer bors <bors@rust-lang.org>

Tue, 23 Apr 2013 00:36:49 +0000 (17:36 -0700)
author bors <bors@rust-lang.org>
Tue, 23 Apr 2013 00:36:49 +0000 (17:36 -0700)
committer bors <bors@rust-lang.org>
Tue, 23 Apr 2013 00:36:49 +0000 (17:36 -0700)
diff --cc src/librustc/back/link.rs
Simple merge
diff --cc src/librustc/driver/driver.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 23 Apr 2013 00:36:49 +0000 (17:36 -0700)
committer	bors <bors@rust-lang.org>
	Tue, 23 Apr 2013 00:36:49 +0000 (17:36 -0700)
		1	2
src/librustc/back/link.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/driver/driver.rs	patch \|	diff1 \|	diff2 \|	blob \| history