Backed out changeset 6150269410b2 (bug 921212) for bustage on a CLOSED TREE.
Automatic merge