[nss/f19: 7/7] Merge branch 'master' into f19

[Elio Maldonado]

commit 497b79c7da04071f6186c6cfb3893933e63d3680
Merge: 35c607f 2f66633
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Jun 17 17:32:22 2013 -0700

    Merge branch 'master' into f19
    
    - update nss-ssl-cbc-random-iv-off-by-default.patch
    - disable patch that makes failed attempt at unsupported ssl pkcs11 bypass fatal

 nss.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc nss.spec
index 2017e8b,082e98b..c94fd66
--- a/nss.spec
+++ b/nss.spec
@@@ -184,8 -183,8 +184,8 @@@ 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 .cbcrandomivoff
 +%patch29 -p0 -b .cbcrandomivoff
- %patch39 -p0 -b .nobypass
+ #%patch39 -p0 -b .nobypass
  %patch40 -p0 -b .noocsptest
  #%patch43 -p0 -b .nosoftokentests
  %patch44 -p1 -b .syncupwithupstream