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

Conflicts:
	mk/crates.mk
	src/librustc_llvm/lib.rs
	src/librustrt/thread.rs
	src/test/run-pass/backtrace.rs