[nss/f15/master: 4/4] Merge branch 'master' into f15

[Elio Maldonado]

commit da8533319e6e1fa8a55d9bc0b09c2739c7ac31c6
Merge: 0cac428 4a912ae
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Mar 25 14:54:45 2011 -0700

    Merge branch 'master' into f15
    
    - Update to NSS_3.12.9_WITH_CKBI_1_82_RTM
    - nss security update for compromized certificates
    - see mozilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=642395

 nss.spec |    5 ++++-
 sources  |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc nss.spec
index a92f595,45e1895..cd2ea5f
--- a/nss.spec
+++ b/nss.spec
@@@ -519,6 -519,9 +519,9 @@@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/n
  
  
  %changelog
 -* Wed Mar 23 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-14
++* Wed Mar 25 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-14
+ - Update to NSS_3.12.9_WITH_CKBI_1_82_RTM
+ 
  * Wed Feb 24 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-13
  - Short-term fix for ssl test suites hangs on ipv6 type connections (#539183)