Bug 229193
Bug 229193

Patch by wtc revied by relyea & ian

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