Backed out changeset b158656d754e (bug 921035) for test bustage
Automatic merge