[nss/f18: 4/4] Merge branch 'master' into f18

[Elio Maldonado]

commit 9b0bed55b950745684bb4a5330a1ba56b5655222
Merge: 37e12fb 7a7f48e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 1 16:57:32 2013 -0800

    Merge branch 'master' into f18
    
    Update to NSS_3_14_2_RTM

 .gitignore                                         |    2 +-
 ...d-key-usage-for-MS-Authenticode-Code-Sign.patch |  168 --------------------
 nss-3.14.0.0-disble-ocsp-test.patch                |    9 +-
 nss-ssl-cbc-random-iv-off-by-default.patch         |   19 ++-
 nss.spec                                           |   24 ++--
 sources                                            |    2 +-
 6 files changed, 35 insertions(+), 189 deletions(-)
---
diff --cc nss.spec
index 318a4f6,ee0fc28..fe9de0d
--- a/nss.spec
+++ b/nss.spec
@@@ -161,10 -158,9 +158,10 @@@ low level services
  # link pem against buildroot's freebl, essential when mixing and matching
  %patch25 -p0 -b .systemfreebl
  # activate for stable and beta branches
- %patch29 -p0 -b .770682
 -#%patch29 -p0 -b .cbcrandomivoff
++%patch29 -p0 -b .cbcrandomivoff
  %patch39 -p1 -b .nobypass
  %patch40 -p1 -b .noocsptest
 +%patch42 -p0 -b .870864
  %patch43 -p0 -b .nosoftokentests
  
  %build