[nss/f19: 2/2] Merge branch 'f20' into f19

[Elio Maldonado]

commit e0216f968e9a155f4de942a37528f00451a11016
Merge: 6f4e83e 890f70e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Jul 1 12:21:09 2014 -0700

    Merge branch 'f20' into f19
    
    - Update to nss-3.16.2

 .gitignore                      |    2 +-
 nss-versus-softoken-tests.patch |   38 --------------------------------
 nss.spec                        |   46 ++++++++++++++++++++------------------
 sources                         |    2 +-
 4 files changed, 26 insertions(+), 62 deletions(-)
---
diff --cc nss.spec
index ff5c966,42d37c2..4ff34a6
--- a/nss.spec
+++ b/nss.spec
@@@ -178,11 -174,8 +176,10 @@@ low level services
  %patch18 -p0 -b .646045
  # link pem against buildroot's freebl, essential when mixing and matching
  %patch25 -p0 -b .systemfreebl
 +# activate for stable branches
 +%patch29 -p0 -b .cbcrandomivoff
  %patch40 -p0 -b .noocsptest
  %patch47 -p0 -b .templates
- %patch48 -p0 -b .crypto
  %patch49 -p0 -b .skipthem
  %patch50 -p0 -b .iquote