# HG changeset patch
# User coffeys
# Date 1406887524 -3600
# Node ID c2c84a3866178e4434423c13ddd94f00b1493d30
# Parent  c0834af12da5c4a4e9c04a2a139b080bb5fb2922# Parent  57cd66833abf44f499faaaed2c16bdf94b258ca9
Merge

diff -r c0834af12da5 -r c2c84a386617 .hgtags
--- a/.hgtags	Tue Jul 22 10:44:17 2014 -0700
+++ b/.hgtags	Fri Aug 01 11:05:24 2014 +0100
@@ -309,6 +309,9 @@
 31d43d250c836c13fcc87025837783788c5cd0de jdk8u20-b21
 2d360fb1b2b89c90133231f9ed5f823997b70c19 jdk8u20-b22
 f3bf1b270fea8b17aa2846f962f7514b6f772ab4 jdk8u20-b23
+1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b24
+1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b25
+7025a2c10ea4116ce8f31bb1e305f732aa1025f0 jdk8u20-b26
 efc85d318f4697f40bdd1f3757677be97f1758d9 jdk8u25-b00
 a76779e1b0376650dfc29a1f3b14760f05e0fc6d jdk8u25-b01
 3d31955043b9f1807c9d695c7b5d604d11c132cf jdk8u25-b02
@@ -318,4 +321,6 @@
 433da54f73257545d95edbc356fdb0e37a9d95eb jdk8u25-b06
 cccfc3f8dec888c8fe86c212a51af2fba1e11aef jdk8u25-b07
 c758be4c3cac65a2744bf4e7ed9bdabb85234de2 jdk8u25-b08
+73423d29fe362e843cdccad510e2e44e2899bc9e jdk8u25-b09
+391b45e0081afcf3db709878916063a63dca7b05 jdk8u25-b10
 3a676fe898c93ad3afcaa55a71da96455e5f230e jdk8u31-b00
diff -r c0834af12da5 -r c2c84a386617 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Tue Jul 22 10:44:17 2014 -0700
+++ b/THIRD_PARTY_README	Fri Aug 01 11:05:24 2014 +0100
@@ -2,7 +2,7 @@
 -----------------------------
 
 %% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0, which may be included with JRE 8, and JDK 8, and 
+Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
 OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1471,7 +1471,7 @@
 version 2.0.
 
 The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
+NSS source code labeled with the "NSS_3_16_RTM" HG tag.
 
 The NSS source code is available in the OpenJDK source code repository at:
     jdk/test/sun/security/pkcs11/nss/src
@@ -3349,14 +3349,14 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.5, which may be included 
+%% This notice is provided with respect to zlib v1.2.8, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.5, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  version 1.2.8, April 28th, 2013
+
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -3382,11 +3382,11 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
-
-  Apache Commons Math 2.2
-  Apache Derby 10.10.1.2        [included with JDK 8]
-  Apache Jakarta BCEL 5.2 
+included with JRE 8, JDK 8, and OpenJDK 8.
+
+  Apache Commons Math 3.2
+  Apache Derby 10.10.1.3        
+  Apache Jakarta BCEL 5.1 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XML Security for Java 1.5.4
   Apache Xalan-Java 2.7.1