Merge NSS_3_14_2_RTM.

README.chromium

Index: README.chromium
===================================================================
--- README.chromium	(revision 180567)
+++ README.chromium	(working copy)
@@ -1,13 +1,13 @@
 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
@@ -21,7 +21,7 @@
 
 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:
@@ -68,3 +68,6 @@
   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).