Merge branch 'master' of https://github.com/mozilla/rust

Conflicts:
	configure
	src/compiletest/compiletest.rs
	src/liballoc/heap.rs
	src/libcore/intrinsics.rs
	src/librustc/back/link.rs
	src/librustc/back/write.rs
	src/librustc/driver/config.rs
	src/librustc/metadata/loader.rs
	src/librustc/middle/trans/adt.rs
	src/librustc/middle/trans/base.rs
	src/librustc/middle/trans/cabi.rs
	src/librustc/middle/trans/context.rs
	src/librustc/middle/trans/type_.rs
	src/librustc_back/archive.rs
	src/librustc_back/rpath.rs
	src/librustrt/thread.rs