# HG changeset patch
# User asaha
# Date 1316116870 25200
# Node ID ae2d0e777dec6f67ca0656bf42c9aeb2fd491f67
# Parent  f6ba2486fbcf1230ba7e1133cb7c56ff336047e8# Parent  7d31bc168b6b5c2d910148f18a6e9876c2b4b74e
Merge

diff -r f6ba2486fbcf -r ae2d0e777dec .hgtags
--- a/.hgtags	Wed Sep 14 22:11:19 2011 -0700
+++ b/.hgtags	Thu Sep 15 13:01:10 2011 -0700
@@ -121,7 +121,11 @@
 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144
 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
+c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
+4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
+272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
+48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
 2605f832dfbfcea8342133b9ec6ab1017674d56f jdk7u2-b01
 e94a8b7a96290ade0eef51ea113ee53a95c0c9c9 jdk7u2-b04
 aec267c02523c33d277b7157a702d5a853c6ed1d jdk7u2-b05
diff -r f6ba2486fbcf -r ae2d0e777dec jaxws.properties
--- a/jaxws.properties	Wed Sep 14 22:11:19 2011 -0700
+++ b/jaxws.properties	Thu Sep 15 13:01:10 2011 -0700
@@ -25,8 +25,8 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxws_src.bundle.name=jdk7-jaxws2_2_4-b03-2011_05_27.zip
-jaxws_src.bundle.md5.checksum=2f5b829ade70f67fe272d0b322e3e702
+jaxws_src.bundle.name=jdk7-jaxws2_2_4-b04-2011_06_01.zip
+jaxws_src.bundle.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
 jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7