auto merge of #466 : pcwalton/servo/phantom-type, r=pcwalton
23a3ac0
See the explanation on the commit for more detail. r? @metajack