[nss/f12/master: 54/54] Merge branch 'master' into f12

[Elio Maldonado]

commit 3f18acf7eca932a24a859010908a6f0bb543ee83
Merge: 07c5cd9 ebb7b25
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 11 10:23:10 2010 -0700

    Merge branch 'master' into f12
    
    Keep f12 changelog history.

 .gitignore                     |    2 +-
 nss-sysinit-userdb-first.patch |   65 ++++++++++++++++++++++++++++++++++++++++
 nss.spec                       |   33 ++++++++++++++------
 sources                        |    2 +-
 4 files changed, 90 insertions(+), 12 deletions(-)
---
diff --cc nss.spec
index ed29e1c,971fa44..1e21f51
--- a/nss.spec
+++ b/nss.spec
@@@ -487,8 -488,22 +488,20 @@@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/n
  
  
  %changelog
+ * Mon Aug 09 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-11
+ - Removed pem sourecs as they are in the cache
+ 
+ * Mon Aug 09 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-10
+ - Add support for PKCS#8 encoded PEM RSA private key files (#614532)
+ 
+ * Fri Jul 31 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-9
+ - Fix nsssysinit to return userdb ahead of systemdb (#603313)
+ 
+ * Tue Jun 08 2010 Dennis Gilmore <dennis at ausil.us> - 3.12.6-8
+ - Require and BuildRequire >= the listed version not =
+ 
  * Tue Jun 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-7
- - Require nss-softoken-version 3.12.6
+ - Require nss-softoken 3.12.6
 -
 -* Sun Jun 06 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-6
  - Fix SIGSEGV within CreateObject (#596674)
  
  * Sat Apr 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-5