auto merge of #6172 : Sodel-the-Vociferous/rust/rm_trt_obj_magic_nums, r=catamorphism...

I don't know how one would write a separate test for this sort of thing. Building the compiler, and `make check` worked, which should mean I didn't screw anything.

diff --cc src/librustc/back/abi.rs
Simple merge

diff --cc src/librustc/middle/trans/glue.rs
Simple merge