Bug 681382 - restore a safe change, fixing Tinderbox
Bug 681382 - restore a safe change, fixing Tinderbox

ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss