Integrate r11141 into releases/2.5.

Review by: skybrian@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.5@11145 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentCount.java

diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentCount.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentCount.java
index 56ab559..d085d97 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentCount.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentCount.java
@@ -18,7 +18,7 @@
 import com.google.gwt.util.tools.ArgHandlerInt;
 
 /**
- * An ArgHandler to provide the -XfragmentMerge flag.
+ * An ArgHandler to provide the -XfragmentCount flag.
  */
 public class ArgHandlerFragmentCount extends ArgHandlerInt {
 

dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java

diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java
index 41c1870..51a6687 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java
@@ -30,7 +30,7 @@
 
   @Override
   public String getPurpose() {
-    return "DEPRECATED (use -XfragmentMerge instead): " +
+    return "DEPRECATED (use -XfragmentCount instead): " +
       "Enables Fragment merging code splitter.";
   }