Carry Wan-Teh's fix for bug 208996 forward to trunk.
Carry Wan-Teh's fix for bug 208996 forward to trunk.

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