# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1449987580 28800
# Node ID 7c523e38f0a82babbe8316244328cce326a3e85d
# Parent  2230b8f8e03a8eaefc83acb577f30c4de88c45a7# Parent  e1bcc77e989a2b1dd06a4a65c12137d3e25d1a06
Merge from main OpenJDK repository

diff -r 2230b8f8e03a -r 7c523e38f0a8 .hgtags
--- a/.hgtags	Tue Oct 20 23:03:53 2015 +0100
+++ b/.hgtags	Sat Dec 12 22:19:40 2015 -0800
@@ -123,6 +123,7 @@
 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
+ce6378e3c791c56b98cbf161804a07d0225b41c0 7u0
 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04