[nss/f17: 25/25] Merge branch 'f18' into f17

[Elio Maldonado]

commit 4729bb6f26c4f09ef373810fc23025a707dc7419
Merge: aec3543 57fe405
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Dec 23 17:38:55 2012 -0800

    Merge branch 'f18' into f17
    
    - Update to nss-3.14.1

 .gitignore                                 |    2 +-
 Bug-872124-fix-pk11wrap-locking.patch      |  393 ----------------------------
 no-softoken-freebl-tests.patch             |   39 +++
 nss-ssl-cbc-random-iv-off-by-default.patch |   13 -
 nss.spec                                   |   61 +++--
 sources                                    |    4 +-
 6 files changed, 85 insertions(+), 427 deletions(-)
---