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

[Elio Maldonado]

commit 4e34fec972c0b55c2c54fc4d48187db73cc1f5b9
Merge: e716f9f 9261ec0
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Feb 19 18:20:30 2013 -0800

    Merge branch 'master' into f18
    
    - Update to NSS_3_14_3_RTM

 nss-softokn.spec |    8 +++-----
 sources          |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --cc sources
index 1580e54,f65b0e9..037c557
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,1 @@@
- 1feefa2f9cb797bc221a4af2e721f65f  nss-softokn-3.14.3-stripped.tar.bz2
 -d200ec78ced4c79a9a52a70590027878  nss-softokn-3.14.2-stripped.tar.bz2
+ 2eb085eb0e9f62b555af1b05ebe86faa  nss-softokn-3.14.3-stripped.tar.bz2