[nss/f14/master: 2/2] Merge branch 'master' into f14

[Elio Maldonado]

commit 78e9db1518f074922148248c04be6ac2ba75ba94
Merge: 93c126b c647f95
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Aug 14 16:17:48 2010 -0700

    Merge branch 'master' into f14

 ...d-support-for-PKCS-8-encoded-private-keys.patch |  237 ++++++++++++++++++++
 0001-Do-not-define-SEC_SkipTemplate.patch          |   35 +++
 nss.spec                                           |   17 +-
 3 files changed, 284 insertions(+), 5 deletions(-)
---