# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1454376433 28800
# Node ID 783b3540e209aea8b4c3ad598ed2a815a02703e2
# Parent  a28bc539342e4ca724a5abd2521c6a58f04c2113# Parent  014244c4a547fb5f8d04ad094986477d52b47567
Merge from main OpenJDK repository

diff -r a28bc539342e -r 783b3540e209 .hgtags
--- a/.hgtags	Fri Nov 13 02:43:36 2015 +0000
+++ b/.hgtags	Mon Feb 01 17:27:13 2016 -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 a28bc539342e -r 783b3540e209 make/Defs-internal.gmk