# HG changeset patch
# User lana
# Date 1304207838 25200
# Node ID 459854f564ed0e5fef7e7d89c18b9429e810863a
# Parent  4caf17560ae0c448b40c6500d220b9dc7e685a29# Parent  8505c91a1f85a08e86302a1fb4a3ad671b3d1191
Merge

diff -r 4caf17560ae0 -r 459854f564ed .hgignore
--- a/.hgignore	Sat Apr 30 11:57:46 2011 +0100
+++ b/.hgignore	Sat Apr 30 16:57:18 2011 -0700
@@ -1,3 +1,4 @@
 ^build/
 ^dist/
 /nbproject/private/
+^.hgtip
diff -r 4caf17560ae0 -r 459854f564ed .hgtags
--- a/.hgtags	Sat Apr 30 11:57:46 2011 +0100
+++ b/.hgtags	Sat Apr 30 16:57:18 2011 -0700
@@ -113,3 +113,4 @@
 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
+853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
diff -r 4caf17560ae0 -r 459854f564ed src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
--- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Sat Apr 30 11:57:46 2011 +0100
+++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Sat Apr 30 16:57:18 2011 -0700
@@ -43,7 +43,7 @@
 main.no_source_files_for_package=\u6CA1\u6709\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6
 main.fatal.error=\u81F4\u547D\u9519\u8BEF
 main.fatal.exception=\u81F4\u547D\u5F02\u5E38\u9519\u8BEF
-main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216\u70ED\u70B9 VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002
+main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216 HotSpot VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002
 main.done_in=[\u5728 {0} \u6BEB\u79D2\u5185\u5B8C\u6210]
 main.doclet_method_must_be_static=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u4E3A\u9759\u6001\u3002
 main.must_return_int=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u8FD4\u56DE\u6574\u578B\u503C\u3002