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

[Elio Maldonado]

commit 0b65e562e837451bd38b010a1c63d7263a41b9fd
Merge: 3f18acf c647f95
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Aug 14 17:47:19 2010 -0700

    Merge branch 'master' into f12

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