# HG changeset patch
# User asaha
# Date 1436507323 25200
# Node ID 34221564cc133b306fa2cbadea0524ccb6c11e78
# Parent  6e2ea0dd2f33b5ac515f74f21a19a995fe5955d5# Parent  2e466ab803ea550d61d9b7403400df4b493b4d57
Merge

diff -r 6e2ea0dd2f33 -r 34221564cc13 .hgtags
--- a/.hgtags	Mon Jul 06 12:25:49 2015 -0700
+++ b/.hgtags	Thu Jul 09 22:48:43 2015 -0700
@@ -423,6 +423,7 @@
 4a6824c3fd8d74f83daac1a79952786837a9848c jdk8u51-b14
 dde8e5b2366b9a08d7448c3cef2cabc710cc9da5 jdk8u51-b15
 e465c106bfe3feb6e2887fa512511c894c092dde jdk8u51-b16
+b189fe14d0f4375961a60d3e8532ca652e1aa592 jdk8u51-b31
 c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
 7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
 5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
@@ -445,6 +446,8 @@
 5b422975b71def8c5a16a4f303c8fb8b108dc0cf jdk8u60-b19
 1a4b2888aa98ea70aad849e35e05b48e1c107503 jdk8u60-b20
 a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21
+6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22
+c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23
 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06
 45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07
 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00
diff -r 6e2ea0dd2f33 -r 34221564cc13 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Mon Jul 06 12:25:49 2015 -0700
+++ b/THIRD_PARTY_README	Thu Jul 09 22:48:43 2015 -0700
@@ -1140,37 +1140,6 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to JSON, which may be included 
-with JRE 8 & JDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Kerberos functionality, which 
 which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
@@ -1250,7 +1219,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.6.16, which may be
+%% This notice is provided with respect to libpng 1.6.16, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1370,7 +1339,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libungif 4.1.3, which may be 
+%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1399,13 +1368,13 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Little CMS 2.5, which may be 
+%% This notice is provided with respect to Little CMS 2.7, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
 Little CMS
-Copyright (c) 1998-2011 Marti Maria Saguer
+Copyright (c) 1998-2015 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal