Backed out changeset e2536905b186 (bug 940194) for bustage.
Backed out changeset 4887ddabba31 (bug 939231) for mochitest hangs.
CLOSED TREE