Backed out changeset 7c4360f398ff (bug 1064002) for causing Bug 1102115
Merge mozilla-central to mozilla-inbound on a CLOSED TREE