auto merge of #11521 : dguenther/rust/hide_libdir_relative, r=alexcrichton

author bors <bors@rust-lang.org>

Tue, 14 Jan 2014 23:11:30 +0000 (15:11 -0800)

committer bors <bors@rust-lang.org>

Tue, 14 Jan 2014 23:11:30 +0000 (15:11 -0800)
author bors <bors@rust-lang.org>
Tue, 14 Jan 2014 23:11:30 +0000 (15:11 -0800)
committer bors <bors@rust-lang.org>
Tue, 14 Jan 2014 23:11:30 +0000 (15:11 -0800)
diff --cc configure
Simple merge
diff --cc mk/tests.mk
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 14 Jan 2014 23:11:30 +0000 (15:11 -0800)
committer	bors <bors@rust-lang.org>
	Tue, 14 Jan 2014 23:11:30 +0000 (15:11 -0800)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
mk/tests.mk	patch \|	diff1 \|	diff2 \|	blob \| history