Backed out changeset 3f9060993657 (bug 1042327)
Backed out changeset ed7a32143aeb (bug 1041530) for OS X debug mochitest failures
merge m-i -> ash