# HG changeset patch
# User jrose
# Date 1327635548 28800
# Node ID 072384a61312a1f76f5c42c837194ac478b99e8a
# Parent  20334ed5ed3c182737b0b00e3e373f8e11ac880c# Parent  5f3fcd591768d35e6489b28490cea5c3b0ab9802
Merge

diff -r 20334ed5ed3c -r 072384a61312 .hgtags
--- a/.hgtags	Thu Jan 26 12:15:24 2012 -0800
+++ b/.hgtags	Thu Jan 26 19:39:08 2012 -0800
@@ -211,3 +211,5 @@
 fe2c8764998112b7fefcd7d41599714813ae4327 jdk8-b20
 9952d1c439d64c5fd4ad1236a63a62bd5a49d4c3 jdk8-b21
 513351373923f74a7c91755748b95c9771e59f96 hs23-b10
+24727fb37561779077fdfa5a33342246f20e5c0f jdk8-b22
+dcc292399a39113957eebbd3e487b7e05e2c79fc hs23-b11
diff -r 20334ed5ed3c -r 072384a61312 make/hotspot_version
--- a/make/hotspot_version	Thu Jan 26 12:15:24 2012 -0800
+++ b/make/hotspot_version	Thu Jan 26 19:39:08 2012 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=11
+HS_BUILD_NUMBER=12
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8