auto merge of #7734 : alexcrichton/rust/issue-3395, r=sanxiyn

author bors <bors@rust-lang.org>

Sat, 13 Jul 2013 04:40:36 +0000 (21:40 -0700)

committer bors <bors@rust-lang.org>

Sat, 13 Jul 2013 04:40:36 +0000 (21:40 -0700)
author bors <bors@rust-lang.org>
Sat, 13 Jul 2013 04:40:36 +0000 (21:40 -0700)
committer bors <bors@rust-lang.org>
Sat, 13 Jul 2013 04:40:36 +0000 (21:40 -0700)
diff --cc src/librustc/middle/lint.rs
Simple merge
diff --cc src/rt/rust_builtin.cpp
Simple merge
author	bors <bors@rust-lang.org>
	Sat, 13 Jul 2013 04:40:36 +0000 (21:40 -0700)
committer	bors <bors@rust-lang.org>
	Sat, 13 Jul 2013 04:40:36 +0000 (21:40 -0700)
		1	2
src/librustc/middle/lint.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/rt/rust_builtin.cpp	patch \|	diff1 \|	diff2 \|	blob \| history