Backed out changeset dd53f54dbaa9 (bug 946618)
Backed out changeset fa5e92d8eb82 (bug 946618) for frequent test failures
Automatic merge