# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1449987574 28800
# Node ID 014244c4a547fb5f8d04ad094986477d52b47567
# Parent  2be0ab1a24b2b6910d8f31e3314ffa48f30f21df# Parent  1727e624ac22108989e9251bdd3f456e79245f1d
Merge from main OpenJDK repository

diff -r 2be0ab1a24b2 -r 014244c4a547 .hgtags
--- a/.hgtags	Tue Oct 20 23:03:49 2015 +0100
+++ b/.hgtags	Sat Dec 12 22:19:34 2015 -0800
@@ -123,6 +123,7 @@
 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+00b623147f23ef8a92a25c4c28ef8681dc1d1b52 7u0
 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
diff -r 2be0ab1a24b2 -r 014244c4a547 make/Defs-internal.gmk