3.3b version changes.

74 files changed, 244 insertions, 244 deletions

diff --git a/config/Make.common.rules b/config/Make.common.rules
index 9897928b37f..531d6e8f4b6 100644
--- a/config/Make.common.rules
+++ b/config/Make.common.rules
@@ -13,11 +13,11 @@
 
 SHELL			= /bin/sh
 VERSION_MAJOR   	= 3
-VERSION_MINOR   	= 3
-VERSION_PATCH           = 1
-VERSION			= 3.3.1
-SHORT_VERSION           = 3.3
-SOVERSION		= 33
+VERSION_MINOR   	= 4b
+VERSION_PATCH           = 51
+VERSION			= 3.4b
+SHORT_VERSION           = 3.4
+SOVERSION		= 34b
 
 INSTALL			= cp -fp
 INSTALL_PROGRAM		= ${INSTALL}
diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak
index 7c3a839955f..995fe4a3396 100644
--- a/config/Make.common.rules.mak
+++ b/config/Make.common.rules.mak
@@ -12,11 +12,11 @@
 # ----------------------------------------------------------------------

 

 SHELL			= /bin/sh

-VERSION			= 3.3.1

-INTVERSION		= 3.3.1

-SHORT_VERSION           = 3.3

+VERSION			= 3.4b

+INTVERSION		= 3.4.51

+SHORT_VERSION           = 3.4

 PATCH_VERSION           = 1

-SOVERSION		= 33

+SOVERSION		= 34b

 

 OBJEXT			= .obj

 

diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 3f6212bee0a..8542c0138b3 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -59,7 +59,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="${instance-name}" entry="IceStormService,33:createIceStorm">
+      <service name="${instance-name}" entry="IceStormService,34b:createIceStorm">
 
         <dbenv name="${service}"/>
 
@@ -111,7 +111,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,33:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,34b:createIceStorm">
 
         <dbenv name="${service}"/>
 
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/cpp/demo/IceStorm/clock/config.icebox
+++ b/cpp/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/cpp/demo/IceStorm/counter/config.icebox
+++ b/cpp/demo/IceStorm/counter/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml
index 9857f75de56..81cd38c9bdf 100644
--- a/cpp/demo/IceStorm/replicated/application.xml
+++ b/cpp/demo/IceStorm/replicated/application.xml
@@ -21,7 +21,7 @@
 
        <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand">
 
-         <service name="IceStorm" entry="IceStormService,33:createIceStorm">
+         <service name="IceStorm" entry="IceStormService,34b:createIceStorm">
 
            <dbenv name="${service}"/>
 
diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1
index 461a826bb4f..6f5f1b5077c 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib1
+++ b/cpp/demo/IceStorm/replicated2/config.ib1
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9990
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.s1
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.s1
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2
index 54a0f3ad796..44dc80390db 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib2
+++ b/cpp/demo/IceStorm/replicated2/config.ib2
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9991
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.s2
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.s2
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3
index c12a6328483..1fe4fc0bd22 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib3
+++ b/cpp/demo/IceStorm/replicated2/config.ib3
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9993
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.s3
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.s3
 
 #
 # Warn about connection exceptions
diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf
index d8525b57482..4d0de8b7f60 100644
--- a/cpp/doc/swish/swish.conf
+++ b/cpp/doc/swish/swish.conf
@@ -1,6 +1,6 @@
 Replacerules remove /var/www/html/
-IndexDir /var/www/html/doc/Ice-3.3.1/reference
-IndexDir /var/www/html/doc/Ice-3.3.1/manual
+IndexDir /var/www/html/doc/Ice-3.4b/reference
+IndexDir /var/www/html/doc/Ice-3.4b/manual
 IndexOnly .html
 FileRules filename is _sindex\.html
 DefaultContents HTML*
diff --git a/cpp/doc/swish/swishcgi.conf b/cpp/doc/swish/swishcgi.conf
index 27285bdc9c3..d37ddc5e408 100644
--- a/cpp/doc/swish/swishcgi.conf
+++ b/cpp/doc/swish/swishcgi.conf
@@ -1,6 +1,6 @@
 use lib '/var/www/html/doc/swishdir';
 
-my $ice_version = '3.3.0';
+my $ice_version = '3.4b';
 my $suffix = '-IceTouch';
 
 my $referer = $ENV{HTTP_REFERER} ? $ENV{HTTP_REFERER} : '';
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index e5e462cb0d6..ac069e03294 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -218,8 +218,8 @@ typedef long long Int64;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.3.1" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30301      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.4b" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30451      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
 //
diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc
index 7b0f81d2f69..8614b590b5e 100644
--- a/cpp/src/Freeze/Freeze.rc
+++ b/cpp/src/Freeze/Freeze.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "freeze33d\0"

- #define ORIGINALFILENAME "freeze33d.dll\0"

+ #define INTERNALNAME "freeze34bd\0"

+ #define ORIGINALFILENAME "freeze34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "freeze33\0"

- #define ORIGINALFILENAME "freeze33.dll\0"

+ #define INTERNALNAME "freeze34b\0"

+ #define ORIGINALFILENAME "freeze34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Freeze DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc
index a1a7d9d955f..daf6e5eed5a 100644
--- a/cpp/src/FreezeScript/DumpDB.rc
+++ b/cpp/src/FreezeScript/DumpDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Dump Database\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "dumpdb\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "dumpdb.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc
index d0d670dc192..3d55340b1de 100644
--- a/cpp/src/FreezeScript/TransformDB.rc
+++ b/cpp/src/FreezeScript/TransformDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Transform Database\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "transformdb\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "transformdb.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Glacier2/Glacier2.rc b/cpp/src/Glacier2/Glacier2.rc
index b97221f24de..ba5bfe0de74 100644
--- a/cpp/src/Glacier2/Glacier2.rc
+++ b/cpp/src/Glacier2/Glacier2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "glacier233d\0"

- #define ORIGINALFILENAME "glacier233d.dll\0"

+ #define INTERNALNAME "glacier234bd\0"

+ #define ORIGINALFILENAME "glacier234bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "glacier233\0"

- #define ORIGINALFILENAME "glacier233.dll\0"

+ #define INTERNALNAME "glacier234b\0"

+ #define ORIGINALFILENAME "glacier234b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Glacier2 DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index 3a7895aad39..dce837f882e 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Glacier2 Router\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "glacier2router\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "glacier2router.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index f6f32f15b0f..bf2843732e1 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -2,17 +2,17 @@
 #include "EventLoggerMsg.rc"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "ice33d\0"

- #define ORIGINALFILENAME "ice33d.dll\0"

+ #define INTERNALNAME "ice34bd\0"

+ #define ORIGINALFILENAME "ice34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "ice33\0"

- #define ORIGINALFILENAME "ice33.dll\0"

+ #define INTERNALNAME "ice34b\0"

+ #define ORIGINALFILENAME "ice34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -24,12 +24,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Ice Core DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index 52d6ced0e5b..779c31f2d91 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icebox33d\0"

- #define ORIGINALFILENAME "icebox33d.dll\0"

+ #define INTERNALNAME "icebox34bd\0"

+ #define ORIGINALFILENAME "icebox34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icebox33\0"

- #define ORIGINALFILENAME "icebox33.dll\0"

+ #define INTERNALNAME "icebox34b\0"

+ #define ORIGINALFILENAME "icebox34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceBox DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index 0c822016c62..aab8fcd7881 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceBox Admin\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "iceboxadmin\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "iceboxadmin.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index 6d37edcb4d7..f1e83315ad2 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceBox\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index 2e59fbb4eb9..592cf1836d3 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid Admin\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icegridadmin\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icegridadmin.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index bb5e8f6bd8a..eb3c3c135fd 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid Node\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icegridnode\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icegridnode.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index 6c8734ee12c..197bc2d488a 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid Registry\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icegridregistry\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icegridregistry.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index da7d0050c1b..1370f4344ce 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icegrid33d\0"

- #define ORIGINALFILENAME "icegrid33d.dll\0"

+ #define INTERNALNAME "icegrid34bd\0"

+ #define ORIGINALFILENAME "icegrid34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icegrid33\0"

- #define ORIGINALFILENAME "icegrid33.dll\0"

+ #define INTERNALNAME "icegrid34b\0"

+ #define ORIGINALFILENAME "icegrid34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2.rc b/cpp/src/IcePatch2/IcePatch2.rc
index ddea01a5a08..71c94e43269 100644
--- a/cpp/src/IcePatch2/IcePatch2.rc
+++ b/cpp/src/IcePatch2/IcePatch2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icepatch233d\0"

- #define ORIGINALFILENAME "icepatch233d.dll\0"

+ #define INTERNALNAME "icepatch234bd\0"

+ #define ORIGINALFILENAME "icepatch234bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icepatch233\0"

- #define ORIGINALFILENAME "icepatch233.dll\0"

+ #define INTERNALNAME "icepatch234b\0"

+ #define ORIGINALFILENAME "icepatch234b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index dc2cad85ee1..00786357127 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 Calc\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icepatch2calc\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icepatch2calc.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index 3bc39547149..2013ba20779 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 Client\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icepatch2client\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icepatch2client.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index c5c2de68feb..c16d97551be 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 Server\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icepatch2server\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icepatch2server.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index 8e5ce643742..4da25a98441 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icessl33d\0"

- #define ORIGINALFILENAME "icessl33d.dll\0"

+ #define INTERNALNAME "icessl34bd\0"

+ #define ORIGINALFILENAME "icessl34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icessl33\0"

- #define ORIGINALFILENAME "icessl33.dll\0"

+ #define INTERNALNAME "icessl34b\0"

+ #define ORIGINALFILENAME "icessl34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceSSL DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStorm.rc b/cpp/src/IceStorm/IceStorm.rc
index e5cfd561100..656a2d5880a 100644
--- a/cpp/src/IceStorm/IceStorm.rc
+++ b/cpp/src/IceStorm/IceStorm.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icestorm33d\0"

- #define ORIGINALFILENAME "icestorm33d.dll\0"

+ #define INTERNALNAME "icestorm34bd\0"

+ #define ORIGINALFILENAME "icestorm34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icestorm33\0"

- #define ORIGINALFILENAME "icestorm33.dll\0"

+ #define INTERNALNAME "icestorm34b\0"

+ #define ORIGINALFILENAME "icestorm34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index 33065629bae..0dd49ce4498 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm Admin\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icestormadmin\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icestormadmin.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc
index f3f24994f66..5ffe8d74a85 100644
--- a/cpp/src/IceStorm/IceStormMigrate.rc
+++ b/cpp/src/IceStorm/IceStormMigrate.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm Migrate\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "icestormmigrate\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icestormmigrate.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index 84fc9950959..4978b7d5c6b 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icestormservice33d\0"

- #define ORIGINALFILENAME "icestormservice33d.dll\0"

+ #define INTERNALNAME "icestormservice34bd\0"

+ #define ORIGINALFILENAME "icestormservice34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icestormservice33\0"

- #define ORIGINALFILENAME "icestormservice33.dll\0"

+ #define INTERNALNAME "icestormservice34b\0"

+ #define ORIGINALFILENAME "icestormservice34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm Service DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
index 956c6589bc1..a9e1454ad18 100644
--- a/cpp/src/IceUtil/IceUtil.rc
+++ b/cpp/src/IceUtil/IceUtil.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "iceutil33d\0"

- #define ORIGINALFILENAME "iceutil33d.dll\0"

+ #define INTERNALNAME "iceutil34bd\0"

+ #define ORIGINALFILENAME "iceutil34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "iceutil33\0"

- #define ORIGINALFILENAME "iceutil33.dll\0"

+ #define INTERNALNAME "iceutil34b\0"

+ #define ORIGINALFILENAME "iceutil34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Ice Utilities DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index da67d911da0..8df4ed90573 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icexml33d\0"

- #define ORIGINALFILENAME "icexml33d.dll\0"

+ #define INTERNALNAME "icexml34bd\0"

+ #define ORIGINALFILENAME "icexml34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icexml33\0"

- #define ORIGINALFILENAME "icexml33.dll\0"

+ #define INTERNALNAME "icexml34b\0"

+ #define ORIGINALFILENAME "icexml34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceXML DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc
index 4e322159365..3d795d30ad2 100644
--- a/cpp/src/Slice/Slice.rc
+++ b/cpp/src/Slice/Slice.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "slice33d\0"

- #define ORIGINALFILENAME "slice33d.dll\0"

+ #define INTERNALNAME "slice34bd\0"

+ #define ORIGINALFILENAME "slice34bd.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "slice33\0"

- #define ORIGINALFILENAME "slice33.dll\0"

+ #define INTERNALNAME "slice34b\0"

+ #define ORIGINALFILENAME "slice34b.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice Utilities DLL\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca
index 9048b7b01e4..2202f385c50 100755
--- a/cpp/src/ca/iceca
+++ b/cpp/src/ca/iceca
@@ -109,7 +109,7 @@ if sys.argv[script] == "import":
         # script ../lib). For development purposes we also check ".".
         #
         checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")),
-                          "/usr/share/Ice-3.3.1"]
+                          "/usr/share/Ice-3.4b"]
         for bindir in checkLocations:
             bindir = os.path.normpath(bindir)
             if os.path.exists(os.path.join(bindir, "ImportKey.class")):
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index ec031cee122..8eb8a1fe714 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Service Installer\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "iceserviceinstall\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "iceserviceinstall.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index f7fe1cd95b6..6809adb2c47 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To C++ Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2cpp\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2cpp.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index 5d9b7390e83..e7a5188414d 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To C# Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2cs\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2cs.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc
index 8e12b314086..ed492532538 100644
--- a/cpp/src/slice2freeze/Slice2Freeze.rc
+++ b/cpp/src/slice2freeze/Slice2Freeze.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Freeze Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2freeze\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2freeze.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc
index 0eb44a45fd7..af8ce3ff2f2 100644
--- a/cpp/src/slice2freezej/Slice2FreezeJ.rc
+++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Freeze for Java Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2freezej\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2freezej.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index bd2e770ce9b..439b8662aa6 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To HTML Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2html\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2html.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index 5f454c00e63..0c349b102e4 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Java Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2java\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2java.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc
index 31db7dfc054..fa2ed3fa79e 100644
--- a/cpp/src/slice2php/Slice2PHP.rc
+++ b/cpp/src/slice2php/Slice2PHP.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Python Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2py\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2py.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index 31db7dfc054..fa2ed3fa79e 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Python Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2py\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2py.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc
index 6ff1a72c82a..9a5f13898d2 100644
--- a/cpp/src/slice2rb/Slice2Rb.rc
+++ b/cpp/src/slice2rb/Slice2Rb.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,1,0

- PRODUCTVERSION 3,3,1,0

+ FILEVERSION 3,4,51,0

+ PRODUCTVERSION 3,4,51,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Ruby Translator\0"

-            VALUE "FileVersion", "3.3.1\0"

+            VALUE "FileVersion", "3.4b\0"

             VALUE "InternalName", "slice2rb\0"

             VALUE "LegalCopyright", "Copyright (c) 2003-2009 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2rb.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3.1\0"

+            VALUE "ProductVersion", "3.4b\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/cs/demo/IceStorm/clock/config.icebox
+++ b/cs/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cs/lib/pkgconfig/Glacier2.pc b/cs/lib/pkgconfig/Glacier2.pc
index f3174ea3bdf..fe6664770d0 100644
--- a/cs/lib/pkgconfig/Glacier2.pc
+++ b/cs/lib/pkgconfig/Glacier2.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
 mono_root = /usr
 
 name = Glacier2
diff --git a/cs/lib/pkgconfig/Ice.pc b/cs/lib/pkgconfig/Ice.pc
index 2883c30b337..085c6e89641 100644
--- a/cs/lib/pkgconfig/Ice.pc
+++ b/cs/lib/pkgconfig/Ice.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
 mono_root = /usr
 
 name = Ice
diff --git a/cs/lib/pkgconfig/IceBox.pc b/cs/lib/pkgconfig/IceBox.pc
index 49ada9ab609..a62209dcc11 100644
--- a/cs/lib/pkgconfig/IceBox.pc
+++ b/cs/lib/pkgconfig/IceBox.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
 mono_root = /usr
 
 name = IceBox
diff --git a/cs/lib/pkgconfig/IceGrid.pc b/cs/lib/pkgconfig/IceGrid.pc
index 7de2b7dee6e..05586a54ff8 100644
--- a/cs/lib/pkgconfig/IceGrid.pc
+++ b/cs/lib/pkgconfig/IceGrid.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
 mono_root = /usr
 
 name = IceGrid
diff --git a/cs/lib/pkgconfig/IcePatch2.pc b/cs/lib/pkgconfig/IcePatch2.pc
index b10238a1d84..310581f3434 100644
--- a/cs/lib/pkgconfig/IcePatch2.pc
+++ b/cs/lib/pkgconfig/IcePatch2.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
 mono_root = /usr
 
 name = IcePatch2
diff --git a/cs/lib/pkgconfig/IceStorm.pc b/cs/lib/pkgconfig/IceStorm.pc
index 6570ab44d3e..a2784c39cc0 100644
--- a/cs/lib/pkgconfig/IceStorm.pc
+++ b/cs/lib/pkgconfig/IceStorm.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
 mono_root = /usr
 
 name = IceStorm
diff --git a/cs/src/Glacier2/AssemblyInfo.cs b/cs/src/Glacier2/AssemblyInfo.cs
index 2394b1ccc26..a5194051f68 100644
--- a/cs/src/Glacier2/AssemblyInfo.cs
+++ b/cs/src/Glacier2/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/Ice/AssemblyInfo.cs b/cs/src/Ice/AssemblyInfo.cs
index 9fd787d33a6..3fe6ca28081 100644
--- a/cs/src/Ice/AssemblyInfo.cs
+++ b/cs/src/Ice/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/Ice/Util.cs b/cs/src/Ice/Util.cs
index f10aa205afb..97c7b038de7 100644
--- a/cs/src/Ice/Util.cs
+++ b/cs/src/Ice/Util.cs
@@ -438,7 +438,7 @@ namespace Ice
         /// <returns>The Ice version.</returns>
         public static string stringVersion()
         {
-            return "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch
+            return "3.4b"; // "A.B.C", with A=major, B=minor, C=patch
         }
 
         /// <summary>
@@ -449,7 +449,7 @@ namespace Ice
         /// <returns>The Ice version.</returns>
         public static int intVersion()
         {
-            return 30301; // AABBCC, with AA=major, BB=minor, CC=patch
+            return 30451; // AABBCC, with AA=major, BB=minor, CC=patch
         }
 
         private static object _processLoggerMutex = new object();
diff --git a/cs/src/IceBox/AssemblyInfo.cs b/cs/src/IceBox/AssemblyInfo.cs
index d3875c5ad3c..6f69f4925c1 100644
--- a/cs/src/IceBox/AssemblyInfo.cs
+++ b/cs/src/IceBox/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IceGrid/AssemblyInfo.cs b/cs/src/IceGrid/AssemblyInfo.cs
index 08576ffe0c1..93f11c331d5 100644
--- a/cs/src/IceGrid/AssemblyInfo.cs
+++ b/cs/src/IceGrid/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IcePatch2/AssemblyInfo.cs b/cs/src/IcePatch2/AssemblyInfo.cs
index abff628fff2..7bdb803f51c 100644
--- a/cs/src/IcePatch2/AssemblyInfo.cs
+++ b/cs/src/IcePatch2/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IceSSL/AssemblyInfo.cs b/cs/src/IceSSL/AssemblyInfo.cs
index 4c02451d399..8ce9f924feb 100644
--- a/cs/src/IceSSL/AssemblyInfo.cs
+++ b/cs/src/IceSSL/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IceStorm/AssemblyInfo.cs b/cs/src/IceStorm/AssemblyInfo.cs
index 21a9430397f..81d2c221bf3 100644
--- a/cs/src/IceStorm/AssemblyInfo.cs
+++ b/cs/src/IceStorm/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
 [assembly: AssemblyTrademark("Ice")]
 [assembly: AssemblyCulture("")]         
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/distribution/bin/makemsi.py b/distribution/bin/makemsi.py
index 9afd4e9ab5c..8e69ffdad27 100755
--- a/distribution/bin/makemsi.py
+++ b/distribution/bin/makemsi.py
@@ -12,7 +12,7 @@ import getopt, os, re, shutil, string, sys, zipfile, fileinput
 import logging, cStringIO, glob
 import textwrap
 
-iceVersion = '3.3.1'
+iceVersion = '3.4b'
 looksVersion = '2.1.4'
 formsVersion = '1.2.0'
 
diff --git a/distribution/bin/makethirdpartiesmsi.py b/distribution/bin/makethirdpartiesmsi.py
index 73c2fb6f3a6..e1e65b4951e 100755
--- a/distribution/bin/makethirdpartiesmsi.py
+++ b/distribution/bin/makethirdpartiesmsi.py
@@ -16,7 +16,7 @@ resources = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "..", "s
 sys.path.append(resources)
 import components
 
-iceVersion = '3.3.1'
+iceVersion = '3.4b'
 
 #
 # Current default third party library versions.
diff --git a/distribution/src/common/build.properties b/distribution/src/common/build.properties
index eea43fab104..83e2f97d16e 100644
--- a/distribution/src/common/build.properties
+++ b/distribution/src/common/build.properties
@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 
-ice.version = 3.3.1
+ice.version = 3.4b
 
 #
 # Define debug as on if you want to build with debug information.
diff --git a/distribution/src/rpm/ice.spec b/distribution/src/rpm/ice.spec
index d658fa246e5..026c25070cd 100644
--- a/distribution/src/rpm/ice.spec
+++ b/distribution/src/rpm/ice.spec
@@ -44,7 +44,7 @@
 %endif
 
 Name: ice
-Version: 3.3.1
+Version: 3.4b
 Summary: Files common to all Ice packages 
 Release: 1%{?dist}
 License: GPL with exceptions
@@ -56,8 +56,8 @@ Source1: Ice-rpmbuild-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define soversion 33
-%define dotnetversion 3.3.1
+%define soversion 34b
+%define dotnetversion 3.4..51
 %define dotnetpolicyversion 3.3
 
 %define formsversion 1.2.0
diff --git a/java/config/build.properties b/java/config/build.properties
index fa6d2b3eb64..b97031a84d6 100644
--- a/java/config/build.properties
+++ b/java/config/build.properties
@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 
-ice.version = 3.3.1
+ice.version = 3.4b
 db.version = 4.6.21
 
 #
@@ -32,5 +32,5 @@ lint = unchecked,deprecation
 #
 jgoodies.forms  = /usr/share/java/forms-1.2.0.jar
 jgoodies.looks  = /usr/share/java/looks-2.1.4.jar
-#jgoodies.forms = C:/Ice-3.3.1-ThirdParty-VC80/lib/forms-1.2.0.jar
-#jgoodies.looks = C:/Ice-3.3.1-ThirdParty-VC80/lib/looks-2.1.4.jar
+#jgoodies.forms = C:/Ice-3.4b-ThirdParty-VC80/lib/forms-1.2.0.jar
+#jgoodies.looks = C:/Ice-3.4b-ThirdParty-VC80/lib/looks-2.1.4.jar
diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/java/demo/IceStorm/clock/config.icebox
+++ b/java/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 064dd607257..dc4253eb627 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -502,7 +502,7 @@ public final class Util
     public static String
     stringVersion()
     {
-        return "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch
+        return "3.4b"; // "A.B.C", with A=major, B=minor, C=patch
     }
 
     /**
@@ -515,7 +515,7 @@ public final class Util
     public static int
     intVersion()
     {
-        return 30301; // AABBCC, with AA=major, BB=minor, CC=patch
+        return 30451; // AABBCC, with AA=major, BB=minor, CC=patch
     }
 
     private static String _localAddress = null;
diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java
index cb153ac230c..1c2e0e85c4b 100644
--- a/java/src/IceUtil/Version.java
+++ b/java/src/IceUtil/Version.java
@@ -18,6 +18,6 @@ public final class Version
     //
     // The Ice version.
     //
-    public final static String ICE_STRING_VERSION = "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch
-    public final static int ICE_INT_VERSION = 30301;         // AABBCC, with AA=major, BB=minor, CC=patch
+    public final static String ICE_STRING_VERSION = "3.4b"; // "A.B.C", with A=major, B=minor, C=patch
+    public final static int ICE_INT_VERSION = 30451;         // AABBCC, with AA=major, BB=minor, CC=patch
 }
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index 9ac4099c255..b294a464212 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -28,7 +28,7 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Glacier2.Filter.Category.AcceptUser="2"' + \
         ' --Glacier2.SessionTimeout="30"' + \
         ' --Glacier2.Client.Endpoints="default -p 12347"' + \
-        ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.10"' \
+        ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
         ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/py/demo/IceStorm/clock/config.icebox
+++ b/py/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/vb/demo/IceStorm/clock/config.icebox b/vb/demo/IceStorm/clock/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/vb/demo/IceStorm/clock/config.icebox
+++ b/vb/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions