[nss-util/f18: 2/2] Merge branch 'master' into f18

[Elio Maldonado]

commit f2e220c6574277fb558dc55523e0964e176ced17
Merge: 0b323ba 40af1da
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 1 16:42:52 2013 -0800

    Merge branch 'master' into f18
    
    - Update to NSS_3_14_2_RTM

 .gitignore    |    2 +-
 nss-util.spec |    9 ++++++---
 sources       |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---