[nss: 3/3] Merge branch 'f16'

[Elio Maldonado]

commit e8491da33f3d15b93b89dbfa208971b324ecd76c
Merge: 2980194 3fe2df4
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Dec 6 16:40:25 2011 -0800

    Merge branch 'f16'

 nss.spec                       |   22 ++++++----
 nsspem-use-system-freebl.patch |    5 +--
 terminalrecord.patch           |   90 ----------------------------------------
 3 files changed, 14 insertions(+), 103 deletions(-)
---
diff --cc nss.spec
index 9cfa0c0,74d05a8..954ec76
--- a/nss.spec
+++ b/nss.spec
@@@ -574,7 -574,11 +574,11 @@@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/n
  
  
  %changelog
- * Sun Dec 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-6
 -* Mon Dec 05 2011 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.1-6
++* Mon Dec 05 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-6
+ - Removed unwanted /usr/include/nss3 in front of the normal cflags include path
+ - Removed unnecessary patch dealing with CERTDB_TERMINAL_RECORD, it's visible
+ 
+ * Sun Dec 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-5
  - Statically link the pem module against system freebl found in buildroot
  - Disabling sha224-related powerup selftest until we update softokn
  - Disable sha224 and pss tests which nss-softokn 3.12.x doesn't support