Backed out changeset bd6f1c071516 (bug 968647)
Backed out changeset 743fb3c48ed7 (bug 968647)
Backed out changeset e670f691e2b9 (bug 968647) for mochitest test bustage on OS X on a CLOSED TREE
Automatic merge