Bug 294531 patch by steve p rew rrelyea.
Bug 294531
patch by steve p
rew rrelyea.

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