Merge NSS_3_14_2_RTM.

README.chromium

 Name: Network Security Services (NSS)
 Short Name: nss
 URL: http://www.mozilla.org/projects/security/pki/nss/
-Version: 3.14.1 RC0
+Version: 3.14.2
 License: MPL 2
 License File: mozilla/security/nss/COPYING
 Security Critical: yes
 
 Description:
-NSS 3.14.1 RC0 with NSPR 4.9.5 Beta 2
+NSS 3.14.2 with NSPR 4.9.5 Beta 2
 
 This copy of NSS has been customized for Chromium.  NSPR is also put here
 rather than in a separate directory to emphasize the fact that Chromium is
 using NSPR strictly as an NSS dependency.
 
 We took a subset of NSS, omitting the SSL and SMIME libraries and the
 built-in root CA certificates module.  This NSS subset satisfies the
 dependencies of the NSS SSL library in src/net/third_party/nss.  Do NOT use
 this copy of NSS on platforms that have NSS as system libraries, such as
 Linux.
 
 The source code was checked out from the mozilla.org CVS repository using
 the nspr-checkout.sh and nss-checkout.sh scripts in the scripts directory.
-The current source code was checked out with the CVS tags -r NSS_3_14_1_RC0
+The current source code was checked out with the CVS tags -r NSS_3_14_2_RTM
 and -r NSPR_4_9_5_BETA2.
 
 Local Modifications:
 
 We made the following local changes to NSPR.
 - patches/nspr-static.patch: to build NSPR as static libraries.  See NSPR
   bug 533014 (https://bugzilla.mozilla.org/show_bug.cgi?id=533014).
 - patches/prcpucfg.h: added to the mozilla/nsprpub/pr/include directory.
 - patches/nspr-attach-as-system-thread.patch: attach a "foreign" thread
   (a thread not created by NSPR) to NSPR as a "system" thread rather than
@@ skipping 26 matching lines @@
 - mozilla/security/nss/lib/freebl/mpi/mpi_arm_mac.c: a wrapper file for
   mpi_arm.c for iOS and Mac OS X. This works around the inability to
   specify target arch specific source files in Xcode. 
 - patches/nss-remove-fortezza.patch: remove Fortezza certificate support
   from PK11_ImportPublicKey.  See NSS bug 668397
   (https://bugzilla.mozilla.org/show_bug.cgi?id=668397).
 - mozilla/security/nss/lib/freebl/ecl/ecp_256_32.c
   patches/nss-curve-p256.patch: add an optimized 32-bit implementation of
   the NIST P-256 elliptic curve.  See NSS bug 831006
   (https://bugzilla.mozilla.org/show_bug.cgi?id=831006).
+- patches/nss-sqlite-tempfilename-ifdef.patch: Allow compiling with sqlite
+  versions which do not define SQLITE_FCNTL_TEMPFILENAME.  See NSS bug 837799
+  (https://bugzilla.mozilla.org/show_bug.cgi?id=837799).