# HG changeset patch
# User asaha
# Date 1389042658 28800
# Node ID 2f9eb9fcab6c42c8c84ddb44170ea33235116d84
# Parent  bf6415ab0f163a24179a403b26cb0216cbcf7611# Parent  3b69a859e3f9997274c5cb3dec204e1b3906f254
Merge

diff -r 3b69a859e3f9 -r 2f9eb9fcab6c .hgtags
--- a/.hgtags	Fri Jan 03 15:58:00 2014 -0800
+++ b/.hgtags	Mon Jan 06 13:10:58 2014 -0800
@@ -407,3 +407,5 @@
 61ee6bab0763028be1dfbb8513232f1c85628945 hs25-b64
 55fb97c4c58d6ed4db8ec02a382ba518d9265815 hs25-b65
 d3521d8e562a782f66fc0dfdebeffba2c7e3471d jdk8-b122
+4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
+e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02
diff -r 3b69a859e3f9 -r 2f9eb9fcab6c .jcheck/conf
--- a/.jcheck/conf	Fri Jan 03 15:58:00 2014 -0800
+++ b/.jcheck/conf	Mon Jan 06 13:10:58 2014 -0800
@@ -1,1 +1,2 @@
 project=jdk8
+bugids=dup
diff -r 3b69a859e3f9 -r 2f9eb9fcab6c make/hotspot_version
--- a/make/hotspot_version	Fri Jan 03 15:58:00 2014 -0800
+++ b/make/hotspot_version	Mon Jan 06 13:10:58 2014 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2013
+HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=0
-HS_BUILD_NUMBER=65
+HS_MINOR_VER=5
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8