[nss-util/f16: 10/10] Merge branch 'f17' into f16

[Elio Maldonado]

commit 93c01e082561c1bbe8a7154d02b25d82680e507e
Merge: a75a50e 0c586c3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Feb 7 20:32:26 2013 -0800

    Merge branch 'f17' into f16
    
    - Update nss-util to NSS_3_14_2_RTM

 .gitignore                 |    2 +-
 nss-split-util.sh          |    3 ---
 nss-util-adopt-hasht.patch |   11 -----------
 nss-util.spec              |   34 +++++++++++++++++++++-------------
 sources                    |    2 +-
 5 files changed, 23 insertions(+), 29 deletions(-)
---