[nss-util/f16: 5/5] Merge branch 'f17' into f16

[Elio Maldonado]

commit a75a50e1db4d351c83df5fa2804b8fd655e3f85d
Merge: c2bf9f9 b033853
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 26 14:59:39 2012 -0800

    Merge branch 'f17' into f16
    
    - Update to NSS_3.14.1

 .gitignore                |    2 +-
 build-nss-util-only.patch |   96 +++++++++++++++++++++++++++++++++++++++++++++
 nss-split-util.sh         |    8 +++-
 nss-util.spec             |   23 ++++++++++-
 sources                   |    2 +-
 5 files changed, 126 insertions(+), 5 deletions(-)
---
diff --cc nss-util.spec
index c09468f,701202c..4acf59b
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -213,7 -229,10 +229,10 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
+ * Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-1
+ - Update to NSS_3_14_1_RTM
+ 
 -* Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
 +* Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
  - Update to NSS_3_14_RTM
  - Update the license to MPLv2.0
  - remove hasht.h which is now provided by nss-util-devel