Backed out changeset b84baa03b9d1 (bug 868341) for mochitest -4 and bc testfailures
Backed out changeset 70befb4cf2f4 (bug 878935) for mochitest -4 and bc test failures
merge mozilla-central to fx-team on a CLOSED TREE