Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/src/Ice/.depend
	cpp/src/Ice/.depend.mak
	cpp/src/slice2cpp/Gen.cpp

1 files changed, 20 insertions, 1 deletions

diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index ff76acfb62e..9af0d68033a 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -176,7 +176,9 @@ public final class PropertiesI implements Properties
                 //
                 assert(dotPos != -1);
                 String propPrefix = pattern.substring(0, dotPos - 1);
-                if(!propPrefix.equals(prefix))
+                boolean mismatchCase = false;
+                String otherKey = "";
+                if(!propPrefix.toUpperCase().equals(prefix.toUpperCase()))
                 {
                     continue;
                 }
@@ -197,11 +199,28 @@ public final class PropertiesI implements Properties
                             key = IceInternal.PropertyNames.validProps[i][j].deprecatedBy();
                         }
                     }
+
+                    if(!found)
+                    {
+                        pComp = java.util.regex.Pattern.compile(pattern.toUpperCase());
+                        m = pComp.matcher(key.toUpperCase());
+                        if(m.matches())
+                        {
+                            found = true;
+                            mismatchCase = true;
+                            otherKey = pattern.replaceAll("\\\\", "");
+                            break;
+                        }
+                    }
                 }
                 if(!found)
                 {
                     logger.warning("unknown property: " + key);
                 }
+                else if(mismatchCase)
+                {
+                    logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
+                }
             }
         }