Backed out changeset 61f6c63bcb3d (bug 928056) for m-oth failures.
Automatic merge