Fix merge problems from CVS. This version should now compile and work.
Fix merge problems from CVS. This version should now compile and work.

nmav/nss,ekr/nss-old,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,ekr/nss-old