auto merge of #7851 : dotdash/rust/intrinsics, r=pcwalton

author bors <bors@rust-lang.org>

Thu, 18 Jul 2013 06:52:40 +0000 (23:52 -0700)

committer bors <bors@rust-lang.org>

Thu, 18 Jul 2013 06:52:40 +0000 (23:52 -0700)
author bors <bors@rust-lang.org>
Thu, 18 Jul 2013 06:52:40 +0000 (23:52 -0700)
committer bors <bors@rust-lang.org>
Thu, 18 Jul 2013 06:52:40 +0000 (23:52 -0700)
diff --cc src/librustc/middle/trans/base.rs
Simple merge
diff --cc src/librustc/middle/trans/foreign.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 18 Jul 2013 06:52:40 +0000 (23:52 -0700)
committer	bors <bors@rust-lang.org>
	Thu, 18 Jul 2013 06:52:40 +0000 (23:52 -0700)
		1	2
src/librustc/middle/trans/base.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/trans/foreign.rs	patch \|	diff1 \|	diff2 \|	blob \| history