Merge remote-tracking branch 'crabtw/mips' into HEAD

Conflicts:
	src/librustc/middle/trans/foreign.rs
	src/librustc/rustc.rc