# HG changeset patch
# User adinn
# Date 1437402595 -3600
# Node ID 8a9908111cef4baa624e2dc5a03c39d6a09b1739
# Parent  797b756b9e0277107b86cbd77fb5a1f66a34cf06# Parent  0497fdafbc8d19d72bce668e65dc5e5457f6f21a
Merge

diff -r 797b756b9e02 -r 8a9908111cef .hgtags
--- a/.hgtags	Tue Jun 30 16:17:26 2015 +0100
+++ b/.hgtags	Mon Jul 20 15:29:55 2015 +0100
@@ -361,6 +361,7 @@
 9d0c737694ece23547c0a27dcd0ba6cbcdf577f2 jdk8u31-b13
 49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31
 9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32
+ea23d583e36301301612946d34ff6aa90d795dd9 jdk8u31-b33
 31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00
 262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01
 1e91cd08b25ae7d1e0556c9d6dd97dcf2f727ce4 jdk8u40-b02
@@ -389,6 +390,8 @@
 b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
 1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26
 a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27
+a342e6841e8d3bbef44d4158c980be2ab903e10a jdk8u40-b31
+8960bce00f1abecad665291b0077d6e673c0ff64 jdk8u40-b32
 667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
 cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
 855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02
@@ -404,6 +407,26 @@
 3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12
 15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13
 bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14
+cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15
+8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31
+1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32
+74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00
+78d8cafb17e46dd2453704f679ca1e431e4df0ba jdk8u51-b01
+9bd6f57d97e5423d5f25774b095124cbe1eeb9c1 jdk8u51-b02
+a9ed1bcefec1ee0d30ea8cf700cf0813d8588eb0 jdk8u51-b03
+3d07c26d5012f47ef274043a6204db686769d65d jdk8u51-b04
+834da1120e80f17356475a5d3f06a678355dbbf6 jdk8u51-b05
+243ba3774d18cfe2e56fa0e0474255787c360d07 jdk8u51-b06
+13d1721eae3bdea08dcd7b84e0856e6769caafc9 jdk8u51-b07
+cbba234a2b481b236e2bf78c892111b86f6bba81 jdk8u51-b08
+9116c6bb2ffa6bb624ad39f7a98b7b9bed4512dc jdk8u51-b09
+783b917616ab6977f9b3157667d1493636ba66d1 jdk8u51-b10
+5a69995912aae8bd61758e95a3b5edac167b6acc jdk8u51-b11
+1a855f69de645c4bd485d5fb6d9a524994278a16 jdk8u51-b12
+880b67345f557d5613071d09c1cf234a7e1b8759 jdk8u51-b13
+4a6824c3fd8d74f83daac1a79952786837a9848c jdk8u51-b14
+dde8e5b2366b9a08d7448c3cef2cabc710cc9da5 jdk8u51-b15
+e465c106bfe3feb6e2887fa512511c894c092dde jdk8u51-b16
 c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
 7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
 5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
@@ -425,3 +448,7 @@
 53361b1cead8fc5ab1619a0b3baec8d4b411319d jdk8u60-b18
 5b422975b71def8c5a16a4f303c8fb8b108dc0cf jdk8u60-b19
 1a4b2888aa98ea70aad849e35e05b48e1c107503 jdk8u60-b20
+a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21
+6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22
+c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23
+1c394b3be96628b705bb78d62bb4b7c9a7f75175 jdk8u60-b24
diff -r 797b756b9e02 -r 8a9908111cef THIRD_PARTY_README
--- a/THIRD_PARTY_README	Tue Jun 30 16:17:26 2015 +0100
+++ b/THIRD_PARTY_README	Mon Jul 20 15:29:55 2015 +0100
@@ -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