Previous checkin committed wrong patch.  This checkin backs that out and commits the correct fix for bug 397486.  r=alexei.volkov
Previous checkin committed wrong patch.  This checkin backs that out
and commits the correct fix for bug 397486.  r=alexei.volkov

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