[nss-util/f17: 2/2] Merge branch 'master' into f17

[Elio Maldonado]

commit c5711fc2593b4c1ceac156588942da986e776483
Merge: 20f019e 8419394
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Tue Mar 27 15:44:53 2012 -0700

    Merge branch 'master' into f17
    
    - Resolves: Bug 805716 - Library needs partial RELRO support added

 nss-util.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc nss-util.spec
index 62bada3,381fc54..5e1f259
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary:          Network Security Services Utilities Library
  Name:             nss-util
  Version:          3.13.3
--Release:          3%{?dist}
++Release:          4%{?dist}
  License:          MPLv1.1 or GPLv2+ or LGPLv2+
  URL:              http://www.mozilla.org/projects/security/pki/nss/
  Group:            System Environment/Libraries
@@@ -201,9 -205,9 +205,12 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
 -* Wed Mar 21 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-3
++* Tue Mar 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-4
+ - Resolves: Bug 805716 - Library needs partial RELRO support added
+ 
 +* Fri Mar 16 2012 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.3-3
 +- Update the release tag to be higher than in f16
 +
  * Fri Mar 09 2012 Elio Maldonado Batiz <emaldona at redhat.com> - 3.13.3-2
  - Require nspr 4.9