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

Conflicts:
	src/librustc/metadata/common.rs
	src/librustc/metadata/loader.rs