merging javascript branch

6 files changed, 20 insertions, 18 deletions

diff --git a/py/python/.depend b/py/python/.depend
index 33c1e788457..2033f458ed0 100644
--- a/py/python/.depend
+++ b/py/python/.depend
@@ -1,5 +1,5 @@
 Ice_LocalException_ice.py: $(slicedir)/Ice/LocalException.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice
-Ice_Communicator_ice.py: $(slicedir)/Ice/Communicator.ice $(slicedir)/Ice/LoggerF.ice $(slicedir)/Ice/StatsF.ice $(slicedir)/Ice/InstrumentationF.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ObjectFactoryF.ice $(slicedir)/Ice/RouterF.ice $(slicedir)/Ice/LocatorF.ice $(slicedir)/Ice/PluginF.ice $(slicedir)/Ice/ImplicitContextF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/BuiltinSequences.ice
+Ice_Communicator_ice.py: $(slicedir)/Ice/Communicator.ice $(slicedir)/Ice/LoggerF.ice $(slicedir)/Ice/StatsF.ice $(slicedir)/Ice/InstrumentationF.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ObjectFactoryF.ice $(slicedir)/Ice/RouterF.ice $(slicedir)/Ice/LocatorF.ice $(slicedir)/Ice/PluginF.ice $(slicedir)/Ice/ImplicitContextF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/BuiltinSequences.ice
 Ice_CommunicatorF_ice.py: $(slicedir)/Ice/CommunicatorF.ice
 Ice_Logger_ice.py: $(slicedir)/Ice/Logger.ice
 Ice_LoggerF_ice.py: $(slicedir)/Ice/LoggerF.ice
@@ -8,7 +8,8 @@ Ice_ObjectAdapter_ice.py: $(slicedir)/Ice/ObjectAdapter.ice $(slicedir)/Ice/Comm
 Ice_ObjectAdapterF_ice.py: $(slicedir)/Ice/ObjectAdapterF.ice
 Ice_ServantLocator_ice.py: $(slicedir)/Ice/ServantLocator.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice
 Ice_ServantLocatorF_ice.py: $(slicedir)/Ice/ServantLocatorF.ice
-Ice_Properties_ice.py: $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/BuiltinSequences.ice
+Ice_PropertiesAdmin_ice.py: $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/BuiltinSequences.ice
+Ice_Properties_ice.py: $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/BuiltinSequences.ice
 Ice_PropertiesF_ice.py: $(slicedir)/Ice/PropertiesF.ice
 Ice_ObjectFactory_ice.py: $(slicedir)/Ice/ObjectFactory.ice
 Ice_ObjectFactoryF_ice.py: $(slicedir)/Ice/ObjectFactoryF.ice
@@ -45,17 +46,17 @@ Glacier2_PermissionsVerifier_ice.py: $(slicedir)/Glacier2/PermissionsVerifier.ic
 Glacier2_SSLInfo_ice.py: $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/Ice/BuiltinSequences.ice
 Glacier2_Metrics_ice.py: $(slicedir)/Glacier2/Metrics.ice $(slicedir)/Ice/Metrics.ice $(slicedir)/Ice/BuiltinSequences.ice
 IceBox_IceBox_ice.py: $(slicedir)/IceBox/IceBox.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/CommunicatorF.ice $(slicedir)/Ice/PropertiesF.ice $(slicedir)/Ice/SliceChecksumDict.ice
-IceGrid_Admin_ice.py: $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/IceGrid/Descriptor.ice
+IceGrid_Admin_ice.py: $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/IceGrid/Descriptor.ice
 IceGrid_Descriptor_ice.py: $(slicedir)/IceGrid/Descriptor.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice
 IceGrid_Exception_ice.py: $(slicedir)/IceGrid/Exception.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice
-IceGrid_FileParser_ice.py: $(slicedir)/IceGrid/FileParser.ice $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/IceGrid/Descriptor.ice
-IceGrid_Observer_ice.py: $(slicedir)/IceGrid/Observer.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/IceGrid/Descriptor.ice $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/SliceChecksumDict.ice
+IceGrid_FileParser_ice.py: $(slicedir)/IceGrid/FileParser.ice $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/IceGrid/Descriptor.ice
+IceGrid_Observer_ice.py: $(slicedir)/IceGrid/Observer.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/IceGrid/Descriptor.ice $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/SliceChecksumDict.ice
 IceGrid_Locator_ice.py: $(slicedir)/IceGrid/Locator.ice $(slicedir)/Ice/Locator.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/ProcessF.ice
 IceGrid_Query_ice.py: $(slicedir)/IceGrid/Query.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/IceGrid/Exception.ice
-IceGrid_Registry_ice.py: $(slicedir)/IceGrid/Registry.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/IceGrid/Session.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/IceGrid/Descriptor.ice
+IceGrid_Registry_ice.py: $(slicedir)/IceGrid/Registry.ice $(slicedir)/IceGrid/Exception.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/IceGrid/Session.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Admin.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/PropertiesAdmin.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/IceGrid/Descriptor.ice
 IceGrid_Session_ice.py: $(slicedir)/IceGrid/Session.ice $(slicedir)/Glacier2/Session.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Glacier2/SSLInfo.ice $(slicedir)/IceGrid/Exception.ice
 IceGrid_UserAccountMapper_ice.py: $(slicedir)/IceGrid/UserAccountMapper.ice
 IcePatch2_FileInfo_ice.py: $(slicedir)/IcePatch2/FileInfo.ice $(slicedir)/Ice/BuiltinSequences.ice
 IcePatch2_FileServer_ice.py: $(slicedir)/IcePatch2/FileServer.ice $(slicedir)/IcePatch2/FileInfo.ice $(slicedir)/Ice/BuiltinSequences.ice
-IceStorm_IceStorm_ice.py: $(slicedir)/IceStorm/IceStorm.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/IceStorm/Metrics.ice $(slicedir)/Ice/Metrics.ice $(slicedir)/Ice/BuiltinSequences.ice
+IceStorm_IceStorm_ice.py: $(slicedir)/IceStorm/IceStorm.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/SliceChecksumDict.ice $(slicedir)/IceStorm/Metrics.ice $(slicedir)/Ice/Metrics.ice $(slicedir)/Ice/BuiltinSequences.ice
 IceStorm_Metrics_ice.py: $(slicedir)/IceStorm/Metrics.ice $(slicedir)/Ice/Metrics.ice $(slicedir)/Ice/BuiltinSequences.ice
diff --git a/py/python/.depend.mak b/py/python/.depend.mak
index 5f6bbb46f11..5b64c327710 100644
--- a/py/python/.depend.mak
+++ b/py/python/.depend.mak
@@ -1,5 +1,5 @@
 Ice_LocalException_ice.py: "$(slicedir)/Ice/LocalException.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
-Ice_Communicator_ice.py: "$(slicedir)/Ice/Communicator.ice" "$(slicedir)/Ice/LoggerF.ice" "$(slicedir)/Ice/StatsF.ice" "$(slicedir)/Ice/InstrumentationF.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ObjectFactoryF.ice" "$(slicedir)/Ice/RouterF.ice" "$(slicedir)/Ice/LocatorF.ice" "$(slicedir)/Ice/PluginF.ice" "$(slicedir)/Ice/ImplicitContextF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
+Ice_Communicator_ice.py: "$(slicedir)/Ice/Communicator.ice" "$(slicedir)/Ice/LoggerF.ice" "$(slicedir)/Ice/StatsF.ice" "$(slicedir)/Ice/InstrumentationF.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ObjectFactoryF.ice" "$(slicedir)/Ice/RouterF.ice" "$(slicedir)/Ice/LocatorF.ice" "$(slicedir)/Ice/PluginF.ice" "$(slicedir)/Ice/ImplicitContextF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 Ice_CommunicatorF_ice.py: "$(slicedir)/Ice/CommunicatorF.ice"
 Ice_Logger_ice.py: "$(slicedir)/Ice/Logger.ice"
 Ice_LoggerF_ice.py: "$(slicedir)/Ice/LoggerF.ice"
@@ -8,7 +8,8 @@ Ice_ObjectAdapter_ice.py: "$(slicedir)/Ice/ObjectAdapter.ice" "$(slicedir)/Ice/C
 Ice_ObjectAdapterF_ice.py: "$(slicedir)/Ice/ObjectAdapterF.ice"
 Ice_ServantLocator_ice.py: "$(slicedir)/Ice/ServantLocator.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice"
 Ice_ServantLocatorF_ice.py: "$(slicedir)/Ice/ServantLocatorF.ice"
-Ice_Properties_ice.py: "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
+Ice_PropertiesAdmin_ice.py: "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
+Ice_Properties_ice.py: "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 Ice_PropertiesF_ice.py: "$(slicedir)/Ice/PropertiesF.ice"
 Ice_ObjectFactory_ice.py: "$(slicedir)/Ice/ObjectFactory.ice"
 Ice_ObjectFactoryF_ice.py: "$(slicedir)/Ice/ObjectFactoryF.ice"
@@ -45,17 +46,17 @@ Glacier2_PermissionsVerifier_ice.py: "$(slicedir)/Glacier2/PermissionsVerifier.i
 Glacier2_SSLInfo_ice.py: "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 Glacier2_Metrics_ice.py: "$(slicedir)/Glacier2/Metrics.ice" "$(slicedir)/Ice/Metrics.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 IceBox_IceBox_ice.py: "$(slicedir)/IceBox/IceBox.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/CommunicatorF.ice" "$(slicedir)/Ice/PropertiesF.ice" "$(slicedir)/Ice/SliceChecksumDict.ice"
-IceGrid_Admin_ice.py: "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/IceGrid/Descriptor.ice"
+IceGrid_Admin_ice.py: "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/IceGrid/Descriptor.ice"
 IceGrid_Descriptor_ice.py: "$(slicedir)/IceGrid/Descriptor.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 IceGrid_Exception_ice.py: "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
-IceGrid_FileParser_ice.py: "$(slicedir)/IceGrid/FileParser.ice" "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/IceGrid/Descriptor.ice"
-IceGrid_Observer_ice.py: "$(slicedir)/IceGrid/Observer.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/IceGrid/Descriptor.ice" "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/SliceChecksumDict.ice"
+IceGrid_FileParser_ice.py: "$(slicedir)/IceGrid/FileParser.ice" "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/IceGrid/Descriptor.ice"
+IceGrid_Observer_ice.py: "$(slicedir)/IceGrid/Observer.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/IceGrid/Descriptor.ice" "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/SliceChecksumDict.ice"
 IceGrid_Locator_ice.py: "$(slicedir)/IceGrid/Locator.ice" "$(slicedir)/Ice/Locator.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/ProcessF.ice"
 IceGrid_Query_ice.py: "$(slicedir)/IceGrid/Query.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/IceGrid/Exception.ice"
-IceGrid_Registry_ice.py: "$(slicedir)/IceGrid/Registry.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/IceGrid/Session.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/IceGrid/Descriptor.ice"
+IceGrid_Registry_ice.py: "$(slicedir)/IceGrid/Registry.ice" "$(slicedir)/IceGrid/Exception.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/IceGrid/Session.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Admin.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/PropertiesAdmin.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/IceGrid/Descriptor.ice"
 IceGrid_Session_ice.py: "$(slicedir)/IceGrid/Session.ice" "$(slicedir)/Glacier2/Session.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Glacier2/SSLInfo.ice" "$(slicedir)/IceGrid/Exception.ice"
 IceGrid_UserAccountMapper_ice.py: "$(slicedir)/IceGrid/UserAccountMapper.ice"
 IcePatch2_FileInfo_ice.py: "$(slicedir)/IcePatch2/FileInfo.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 IcePatch2_FileServer_ice.py: "$(slicedir)/IcePatch2/FileServer.ice" "$(slicedir)/IcePatch2/FileInfo.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
-IceStorm_IceStorm_ice.py: "$(slicedir)/IceStorm/IceStorm.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/IceStorm/Metrics.ice" "$(slicedir)/Ice/Metrics.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
+IceStorm_IceStorm_ice.py: "$(slicedir)/IceStorm/IceStorm.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/SliceChecksumDict.ice" "$(slicedir)/IceStorm/Metrics.ice" "$(slicedir)/Ice/Metrics.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
 IceStorm_Metrics_ice.py: "$(slicedir)/IceStorm/Metrics.ice" "$(slicedir)/Ice/Metrics.ice" "$(slicedir)/Ice/BuiltinSequences.ice"
diff --git a/py/python/Glacier2.py b/py/python/Glacier2.py
index f91f73794d0..fabb926072d 100644
--- a/py/python/Glacier2.py
+++ b/py/python/Glacier2.py
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/py/python/Ice.py b/py/python/Ice.py
index 0563a6a3592..9be78a0d465 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/py/python/Makefile b/py/python/Makefile
index 4c78184b14f..b5a323275ce 100644
--- a/py/python/Makefile
+++ b/py/python/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/py/python/Makefile.mak b/py/python/Makefile.mak
index 52ebca73c79..6486ff5865d 100644
--- a/py/python/Makefile.mak
+++ b/py/python/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.