Backed out changeset 403bbc5e127f (bug 914888) for intermittent xpcshell failures.
Automatic merge