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

[Elio Maldonado]

commit 94bf03b9c2f9c166517ca46d3474d96b7d658149
Merge: 9b182d2 c647f95
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Aug 14 17:17:39 2010 -0700

    Merge branch 'master' into f13

 ...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(-)
---