Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 3 insertions, 2 deletions

diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 3040c22d66b..76436d94eb8 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <IceUtil/Options.h>
+#include <IceUtil/StringUtil.h>
 #include <Ice/Application.h>
 #include <IcePatch2/Util.h>
 #include <IcePatch2/ClientUtil.h>
@@ -54,7 +55,7 @@ public:
         {
             cout << "Do a thorough patch? (yes/no)" << endl;
             cin >> answer;
-            transform(answer.begin(), answer.end(), answer.begin(), ::tolower);
+            answer = IceUtilInternal::toLower(answer);
             if(answer == "no")
             {
                 return false;