[nspr/f16: 34/34] Merge branch 'f17' into f16

[Elio Maldonado]

commit fc11414e8e9b2e0b104b48981fb7babc9be8f3fb
Merge: fb5d0be dd9caa6
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 26 14:57:45 2012 -0800

    Merge branch 'f17' into f16
    
    - Update to NSPR_4_9_4_RTM
    - Selective merge

 .gitignore |    2 +-
 nspr.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc nspr.spec
index 6daf037,67806ca..8353556
--- a/nspr.spec
+++ b/nspr.spec
@@@ -129,22 -120,36 +129,25 @@@ don
  %{_bindir}/nspr-config
  
  %changelog
+ * Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.4-1
+ - Update to NSPR_4_9_4_RTM
+ 
 -* Wed Aug 29 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.2-1
 +* Fri Aug 31 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.2-1
  - Update to NSPR_4_9_2_RTM
  
 -* Wed Jul 11 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-2
 -- Updated License: to MPLv2.0 per upstream
 +* Thu Jul 12 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-2
 +- Retagging
  
 -* Fri Jun 22 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-1
 +* Sun Jul 08 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-1
  - Update to NSPR_4_9_1_RTM
 +- Update License: to MPLv2.0 per upstream
  
 -* Wed Mar 21 2012 Elio Maldonado <emaldona at redhat.com> - 4.9-2
 +* Wed Mar 28 2012 Elio Maldonado <emaldona at redhat.com> - 4.9-2
  - Resolves: Bug 805672 - Library needs partial RELRO support added
  
 -* Wed Feb 29 2012 Elio Maldonado <emaldona at redhat.com> - 4.9-1
 +* Sat Mar 10 2012 Elio Maldonado <emaldona at redhat.com> - 4.9-1
  - Update to NSPR_4_9_RTM
 -
 -* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 4.9-0.2.beta3.1
 -- install everything in /usr
 -  https://fedoraproject.org/wiki/Features/UsrMove
 -
 -* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 4.9-0.2.beta3.1
 -- 
 -
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.9-0.2.beta3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Thu Oct 06 2011 Elio Maldonado <emaldona at redhat.com> - 4.9-0.1.beta3
 -- Update to NSPR_4_9_BETA3
 +- Selective merge from f17, don't install everything in /usr
  
  * Thu Sep  8 2011 Ville Skyttä <ville.skytta at iki.fi> - 4.8.9-2
  - Avoid %%post/un shell invocations and dependencies.