[nss/f12/master: 9/9] Merge branch 'f13' into f12

Tue Oct 5 20:56:06 UTC 2010

commit 91d58b56fbe087dd349dc4f04112e798874873cb
Merge: c1dd8ec 20dceb3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Oct 5 13:45:28 2010 -0700

    Merge branch 'f13' into f12

 .gitignore                     |    2 +-
 nss.spec                       |   36 +++++++++++++++++++++++++++---------
 renegotiate-transitional.patch |   12 ++++--------
 setup-nsssysinit.sh            |   35 ++++++++++++++++++++++++-----------
 sources                        |    2 +-
 system-pkcs11.txt              |    4 ++--
 6 files changed, 59 insertions(+), 32 deletions(-)
---