[nss-util/f15: 6/6] Merge branch 'f16' into f15

[Elio Maldonado]

commit ecdf41637a24b96a9ba4e86a3ea1d488072f9260
Merge: 95dc56d 0e4e9fa
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Apr 7 10:24:30 2012 -0700

    Merge branch 'f16' into f15

 .gitignore              |    2 +-
 mozilla-crypto-strip.sh |  128 +++++++++++++++++++++++++++++++++++++++++++++++
 nss-util.spec           |   43 +++++++++++-----
 sources                 |    2 +-
 4 files changed, 159 insertions(+), 16 deletions(-)
---
diff --cc nss-util.spec
index 6f50f0e,620e9ad..9cd68da
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -201,6 -213,15 +213,9 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
+ * Sat Apr 07 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-1
+ - Update to NSS_3_13_4_RTM
+ 
 -* Wed Mar 28 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3
 -- Resolves: Bug 805716 - Library needs partial RELRO support added
 -
 -* Sat Mar 10 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-2.1
 -- Retagging to synchronize changelog tag with Release tag
 -
  * Sat Mar 10 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-1
  - Update to NSS_3_13_3_RTM
  - Require nspr 4.9