# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1454376434 28800
# Node ID 4d1634237e895cf993913833a369dd401f436257
# Parent  96b735f85c61ad721113713551271106a5070742# Parent  be3a966e2c3eea2743884b3deb5ed439869f070a
Merge from main OpenJDK repository

diff -r 96b735f85c61 -r 4d1634237e89 .hgtags
--- a/.hgtags	Fri Nov 13 02:43:39 2015 +0000
+++ b/.hgtags	Mon Feb 01 17:27:14 2016 -0800
@@ -123,6 +123,7 @@
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+578c4d2c534cc761f5f5cc0d8360471bb8d5f94f 7u0
 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
diff -r 96b735f85c61 -r 4d1634237e89 make/common/Defs-bsd.gmk
diff -r 96b735f85c61 -r 4d1634237e89 make/common/Defs-linux.gmk
diff -r 96b735f85c61 -r 4d1634237e89 make/common/Defs.gmk
diff -r 96b735f85c61 -r 4d1634237e89 make/common/shared/Defs-bsd.gmk
diff -r 96b735f85c61 -r 4d1634237e89 make/common/shared/Defs-utils.gmk
diff -r 96b735f85c61 -r 4d1634237e89 make/common/shared/Platform.gmk
diff -r 96b735f85c61 -r 4d1634237e89 make/sun/corba/core/Makefile