Backed out changeset 79a1f60d83df (bug 909997) for bustage.
CLOSED TREE
Automatic merge