Merge branch 'master' of https://github.com/mozilla/rust into try-merge

Conflicts:
	src/liblibc/lib.rs
	src/libsyntax/abi.rs