Bug 915687 - Watch for type objects with lazy protos when merging off thread parses, r=billm.
Bug 915482 (part 3) - Move some functions out of vm/Shape-inl.h, jsfuninlines.h and jsinferinlines.h.  r=terrence.

--HG--
extra : rebase_source : b2d3805b897d54162eeaeedbd41545b23fd589ba