auto merge of #20024 : mneumann/rust/dragonfly-fixes3, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 25 Dec 2014 05:11:36 +0000 (05:11 +0000)

committer bors <bors@rust-lang.org>

Thu, 25 Dec 2014 05:11:36 +0000 (05:11 +0000)
author bors <bors@rust-lang.org>
Thu, 25 Dec 2014 05:11:36 +0000 (05:11 +0000)
committer bors <bors@rust-lang.org>
Thu, 25 Dec 2014 05:11:36 +0000 (05:11 +0000)
diff --cc src/librustc_back/rpath.rs
Simple merge
diff --cc src/libstd/sys/unix/os.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 25 Dec 2014 05:11:36 +0000 (05:11 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 25 Dec 2014 05:11:36 +0000 (05:11 +0000)
		1	2
src/librustc_back/rpath.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/sys/unix/os.rs	patch \|	diff1 \|	diff2 \|	blob \| history