Bug 632657: SEC_ASN1IsTemplateSimple may incorrectly treat choice templates as simple.  Patch by Brian Smith <bsmith@mozilla.com>.  r=wtc.
Bug 632657: SEC_ASN1IsTemplateSimple may incorrectly treat choice templates
as simple.  Patch by Brian Smith <bsmith@mozilla.com>.  r=wtc.

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