[nss/f16: 26/26] Merge branch 'f17' into f16

[Elio Maldonado]

commit c7f167907d5184317cc688dbc013094d262f320f
Merge: a8b2857 4729bb6
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 26 15:02:53 2012 -0800

    Merge branch 'f17' into f16
    
    - selective merge
    - 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                                   |   28 ++-
 sources                                    |    4 +-
 6 files changed, 64 insertions(+), 415 deletions(-)
---