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

[Elio Maldonado]

commit c2bf9f9cacd6f11bf14af92c17fc45e9186c42cf
Merge: b143733 91897c8
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Dec 17 19:21:01 2012 -0800

    Merge branch 'f17' into f16

 .gitignore    |    3 +--
 nss-util.spec |   26 +++++++++++++-------------
 sources       |    2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)
---
diff --cc nss-util.spec
index 7f00b84,736ed8f..c09468f
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -220,7 -223,14 +213,14 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
 -* 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
+ - added utilmodt.h, utilpars.h, and utilrename.h
+ - update of the whole set of nss-{util|softokn|nss}-devel packages is required to prevent conflicts
+ 
 -* Fri Oct 26 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
 +* Mon Nov 12 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
  - Part 2 of bootstrapping builds to provide a conflict-free update to 3.14 next
  - nss-util-devel will provide sechash.t as nss-softoken-devel won't
  - As of nss-softokn-3.13.6-2 nss-softokn-devel stopped installing hasht.t