Fix for bug 502961. Fix allocator mismatch in pk11mode. r=nelson
Fix for bug 502961. Fix allocator mismatch in pk11mode. r=nelson

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