Fix for bug 222300. r=nelson,wtchang
Fix for bug 222300. r=nelson,wtchang

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