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

[Elio Maldonado]

commit 57fe4051270053f9c6a7acc8263b13c9d6f6b3bf
Merge: 9c95ae5 b13dc44
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Dec 22 19:18:43 2012 -0800

    Merge branch 'master' into f18
    
    - Update to NSS_3_14_1_RTM

 .gitignore                            |    2 +-
 Bug-872124-fix-pk11wrap-locking.patch |  393 ---------------------------------
 no-softoken-freebl-tests.patch        |   39 ++++
 nss.spec                              |   43 ++--
 sources                               |    2 +-
 5 files changed, 66 insertions(+), 413 deletions(-)
---
diff --cc nss.spec
index 6957a5f,9fdb794..d74c8e6
--- a/nss.spec
+++ b/nss.spec
@@@ -150,14 -150,14 +150,14 @@@ low level services
  %patch6 -p0 -b .libpem
  %patch16 -p0 -b .539183
  %patch18 -p0 -b .646045
- # link pem against buildroot's freebl, esential wen mixing and matching
+ # 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 .770682
  %patch39 -p1 -b .nobypass
  %patch40 -p1 -b .noocsptest
- %patch41 -p0 -b .872124
  %patch42 -p0 -b .870864
+ %patch43 -p0 -b .nosoftokentests
  
  %build