wip
Merge branch 'rustup-20141105' of github.com:servo/servo into rustup-20141105

Conflicts:
	Cargo.lock