[nss/f16: 12/13] Merge branch 'master' into f16

[Elio Maldonado]

commit 0598777c8d01d30e4e177f3da5d91c199106ad49
Merge: a1e61fa cc7766a
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Nov 7 08:36:10 2011 -0800

    Merge branch 'master' into f16
    
    Keeping softokn at 3.12.10 as we are bootstrapping the system

 .gitignore                                   |    2 +-
 0001-libnsspem-rhbz-734760.patch             |   21 +
 nss-539183.patch                             |   23 +-
 nss-703658.patch                             |   47 --
 nss-ckbi-1.88.rtm.patch                      |  637 ++++++++++++++++++++++++++
 nss.spec                                     |   44 ++-
 nsspem-createobject-initialize-pointer.patch |   11 +
 nsspem-init-inform-not-thread-safe.patch     |  129 ++++++
 renegotiate-transitional.patch               |   10 +-
 sources                                      |    2 +-
 10 files changed, 854 insertions(+), 72 deletions(-)
---
diff --cc nss.spec
index 11e3cda,acf2cc1..c4d9d7e
--- a/nss.spec
+++ b/nss.spec
@@@ -1,6 -1,6 +1,6 @@@
- %global nspr_version 4.8.8
- %global nss_util_version 3.12.10
+ %global nspr_version 4.8.9
+ %global nss_util_version 3.13.1
 -%global nss_softokn_version 3.13.1
 +%global nss_softokn_version 3.12.10
  %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
  
  Summary:          Network Security Services