diff --git a/Util/Makefile b/Util/Makefile
index 2a52c0a62..b543b94c9 100644
--- a/Util/Makefile
+++ b/Util/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Util/Makefile#1 $
+# $Id: //poco/Main/Util/Makefile#11 $
 #
 # Makefile for Poco Util
 #
diff --git a/Util/Util.vmsbuild b/Util/Util.vmsbuild
index 0ff03f58f..e2323bfa2 100644
--- a/Util/Util.vmsbuild
+++ b/Util/Util.vmsbuild
@@ -1,7 +1,7 @@
 #
 # Util.vmsbuild
 #
-# $Id: //poco/1.3/Util/Util.vmsbuild#1 $
+# $Id: //poco/Main/Util/Util.vmsbuild#2 $
 #
 LIB=PocoUtil
 AbstractConfiguration 
diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h
index b37735bab..de1aa75a1 100644
--- a/Util/include/Poco/Util/AbstractConfiguration.h
+++ b/Util/include/Poco/Util/AbstractConfiguration.h
@@ -1,7 +1,7 @@
 //
 // AbstractConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/AbstractConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/AbstractConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h
index fc7cf024f..9cf8d415c 100644
--- a/Util/include/Poco/Util/Application.h
+++ b/Util/include/Poco/Util/Application.h
@@ -1,7 +1,7 @@
 //
 // Application.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/Application.h#3 $
+// $Id: //poco/Main/Util/include/Poco/Util/Application.h#12 $
 //
 // Library: Util
 // Package: Application
@@ -49,6 +49,7 @@
 #include "Poco/Path.h"
 #include "Poco/Timestamp.h"
 #include "Poco/Timespan.h"
+#include "Poco/AutoPtr.h"
 #include <vector>
 #include <typeinfo>
 
@@ -444,7 +445,7 @@ inline Poco::Timespan Application::uptime() const
 	#define POCO_APP_MAIN(App) \
 	int wmain(int argc, wchar_t** argv)		\
 	{										\
-		AutoPtr<App> pApp = new App;		\
+		Poco::AutoPtr<App> pApp = new App;	\
 		try									\
 		{									\
 			pApp->init(argc, argv);			\
@@ -460,7 +461,7 @@ inline Poco::Timespan Application::uptime() const
 	#define POCO_APP_MAIN(App) \
 	int main(int argc, char** argv)			\
 	{										\
-		AutoPtr<App> pApp = new App;		\
+		Poco::AutoPtr<App> pApp = new App;	\
 		try									\
 		{									\
 			pApp->init(argc, argv);			\
diff --git a/Util/include/Poco/Util/ConfigurationMapper.h b/Util/include/Poco/Util/ConfigurationMapper.h
index 8e7143058..9dedd97ee 100644
--- a/Util/include/Poco/Util/ConfigurationMapper.h
+++ b/Util/include/Poco/Util/ConfigurationMapper.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapper.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/ConfigurationMapper.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/ConfigurationMapper.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/ConfigurationView.h b/Util/include/Poco/Util/ConfigurationView.h
index d25e73e1f..603edff68 100644
--- a/Util/include/Poco/Util/ConfigurationView.h
+++ b/Util/include/Poco/Util/ConfigurationView.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationView.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/ConfigurationView.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/ConfigurationView.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/FilesystemConfiguration.h b/Util/include/Poco/Util/FilesystemConfiguration.h
index b103032fe..d149e33df 100644
--- a/Util/include/Poco/Util/FilesystemConfiguration.h
+++ b/Util/include/Poco/Util/FilesystemConfiguration.h
@@ -1,7 +1,7 @@
 //
 // FilesystemConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/FilesystemConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/FilesystemConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/HelpFormatter.h b/Util/include/Poco/Util/HelpFormatter.h
index 6929e1366..3f60491a9 100644
--- a/Util/include/Poco/Util/HelpFormatter.h
+++ b/Util/include/Poco/Util/HelpFormatter.h
@@ -1,7 +1,7 @@
 //
 // HelpFormatter.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/HelpFormatter.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/HelpFormatter.h#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/IniFileConfiguration.h b/Util/include/Poco/Util/IniFileConfiguration.h
index 53cbbcf6c..e83862f76 100644
--- a/Util/include/Poco/Util/IniFileConfiguration.h
+++ b/Util/include/Poco/Util/IniFileConfiguration.h
@@ -1,7 +1,7 @@
 //
 // IniFileConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/IniFileConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/IniFileConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/IntValidator.h b/Util/include/Poco/Util/IntValidator.h
index 365d20c2c..657538c4c 100644
--- a/Util/include/Poco/Util/IntValidator.h
+++ b/Util/include/Poco/Util/IntValidator.h
@@ -1,7 +1,7 @@
 //
 // IntValidator.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/IntValidator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/IntValidator.h#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/LayeredConfiguration.h b/Util/include/Poco/Util/LayeredConfiguration.h
index 67a81dbbb..f92714d43 100644
--- a/Util/include/Poco/Util/LayeredConfiguration.h
+++ b/Util/include/Poco/Util/LayeredConfiguration.h
@@ -1,7 +1,7 @@
 //
 // LayeredConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/LayeredConfiguration.h#2 $
+// $Id: //poco/Main/Util/include/Poco/Util/LayeredConfiguration.h#3 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h
index d3bd6cd26..b7830bed1 100644
--- a/Util/include/Poco/Util/LoggingConfigurator.h
+++ b/Util/include/Poco/Util/LoggingConfigurator.h
@@ -1,7 +1,7 @@
 //
 // LoggingConfigurator.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/LoggingConfigurator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/LoggingConfigurator.h#3 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/LoggingSubsystem.h b/Util/include/Poco/Util/LoggingSubsystem.h
index 1f07ba79f..02852d8cf 100644
--- a/Util/include/Poco/Util/LoggingSubsystem.h
+++ b/Util/include/Poco/Util/LoggingSubsystem.h
@@ -1,7 +1,7 @@
 //
 // LoggingSubsystem.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/LoggingSubsystem.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/LoggingSubsystem.h#2 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/include/Poco/Util/MapConfiguration.h b/Util/include/Poco/Util/MapConfiguration.h
index e28bce2a3..d8dae8881 100644
--- a/Util/include/Poco/Util/MapConfiguration.h
+++ b/Util/include/Poco/Util/MapConfiguration.h
@@ -1,7 +1,7 @@
 //
 // MapConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/MapConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/MapConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/Option.h b/Util/include/Poco/Util/Option.h
index dceb82607..393725b90 100644
--- a/Util/include/Poco/Util/Option.h
+++ b/Util/include/Poco/Util/Option.h
@@ -1,7 +1,7 @@
 //
 // Option.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/Option.h#2 $
+// $Id: //poco/Main/Util/include/Poco/Util/Option.h#5 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionCallback.h b/Util/include/Poco/Util/OptionCallback.h
index b5297d917..b119d5708 100644
--- a/Util/include/Poco/Util/OptionCallback.h
+++ b/Util/include/Poco/Util/OptionCallback.h
@@ -1,7 +1,7 @@
 //
 // OptionCallback.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/OptionCallback.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionCallback.h#3 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionException.h b/Util/include/Poco/Util/OptionException.h
index 97346b1e0..cad2bb65b 100644
--- a/Util/include/Poco/Util/OptionException.h
+++ b/Util/include/Poco/Util/OptionException.h
@@ -1,7 +1,7 @@
 //
 // OptionException.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/OptionException.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionException.h#3 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionProcessor.h b/Util/include/Poco/Util/OptionProcessor.h
index 9fae139eb..45e24351b 100644
--- a/Util/include/Poco/Util/OptionProcessor.h
+++ b/Util/include/Poco/Util/OptionProcessor.h
@@ -1,7 +1,7 @@
 //
 // OptionProcessor.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/OptionProcessor.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionProcessor.h#3 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionSet.h b/Util/include/Poco/Util/OptionSet.h
index c7cadd9f7..f68db95dd 100644
--- a/Util/include/Poco/Util/OptionSet.h
+++ b/Util/include/Poco/Util/OptionSet.h
@@ -1,7 +1,7 @@
 //
 // OptionSet.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/OptionSet.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionSet.h#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/PropertyFileConfiguration.h b/Util/include/Poco/Util/PropertyFileConfiguration.h
index f4215aed3..d76820fdc 100644
--- a/Util/include/Poco/Util/PropertyFileConfiguration.h
+++ b/Util/include/Poco/Util/PropertyFileConfiguration.h
@@ -1,7 +1,7 @@
 //
 // PropertyFileConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/PropertyFileConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/PropertyFileConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/RegExpValidator.h b/Util/include/Poco/Util/RegExpValidator.h
index 07c54d2ab..3fb443bfd 100644
--- a/Util/include/Poco/Util/RegExpValidator.h
+++ b/Util/include/Poco/Util/RegExpValidator.h
@@ -1,7 +1,7 @@
 //
 // RegExpValidator.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/RegExpValidator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/RegExpValidator.h#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h
index d2bbefcd9..1215c971b 100644
--- a/Util/include/Poco/Util/ServerApplication.h
+++ b/Util/include/Poco/Util/ServerApplication.h
@@ -1,7 +1,7 @@
 //
 // ServerApplication.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/ServerApplication.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/ServerApplication.h#3 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/include/Poco/Util/Subsystem.h b/Util/include/Poco/Util/Subsystem.h
index 9a41cdd01..16e18124f 100644
--- a/Util/include/Poco/Util/Subsystem.h
+++ b/Util/include/Poco/Util/Subsystem.h
@@ -1,7 +1,7 @@
 //
 // Subsystem.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/Subsystem.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Subsystem.h#2 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/include/Poco/Util/SystemConfiguration.h b/Util/include/Poco/Util/SystemConfiguration.h
index 63b968b10..baaa8d225 100644
--- a/Util/include/Poco/Util/SystemConfiguration.h
+++ b/Util/include/Poco/Util/SystemConfiguration.h
@@ -1,7 +1,7 @@
 //
 // SystemConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/SystemConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/SystemConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/Util.h b/Util/include/Poco/Util/Util.h
index 0035930f9..cae942f8d 100644
--- a/Util/include/Poco/Util/Util.h
+++ b/Util/include/Poco/Util/Util.h
@@ -1,7 +1,7 @@
 //
 // Util.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/Util.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Util.h#2 $
 //
 // Library: Util
 // Package: Util
diff --git a/Util/include/Poco/Util/Validator.h b/Util/include/Poco/Util/Validator.h
index 7ba588c33..816a87bf1 100644
--- a/Util/include/Poco/Util/Validator.h
+++ b/Util/include/Poco/Util/Validator.h
@@ -1,7 +1,7 @@
 //
 // Validator.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/Validator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Validator.h#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h
index 03a1ae5bb..f72c4fa33 100644
--- a/Util/include/Poco/Util/WinRegistryConfiguration.h
+++ b/Util/include/Poco/Util/WinRegistryConfiguration.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/WinRegistryConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryConfiguration.h#2 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/include/Poco/Util/WinRegistryKey.h b/Util/include/Poco/Util/WinRegistryKey.h
index 9dae092eb..1128013c2 100644
--- a/Util/include/Poco/Util/WinRegistryKey.h
+++ b/Util/include/Poco/Util/WinRegistryKey.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryKey.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/WinRegistryKey.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryKey.h#2 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/include/Poco/Util/WinService.h b/Util/include/Poco/Util/WinService.h
index f6adc6a52..650bd57a6 100644
--- a/Util/include/Poco/Util/WinService.h
+++ b/Util/include/Poco/Util/WinService.h
@@ -1,7 +1,7 @@
 //
 // WinService.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/WinService.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinService.h#2 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/include/Poco/Util/XMLConfiguration.h b/Util/include/Poco/Util/XMLConfiguration.h
index fc6f694fe..fa82c7331 100644
--- a/Util/include/Poco/Util/XMLConfiguration.h
+++ b/Util/include/Poco/Util/XMLConfiguration.h
@@ -1,7 +1,7 @@
 //
 // XMLConfiguration.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/XMLConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/XMLConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/samples/Makefile b/Util/samples/Makefile
index 23706b5bc..13a7c6087 100644
--- a/Util/samples/Makefile
+++ b/Util/samples/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Util/samples/Makefile#1 $
+# $Id: //poco/Main/Util/samples/Makefile#3 $
 #
 # Makefile for Poco Util Samples
 #
diff --git a/Util/samples/SampleApp/Makefile b/Util/samples/SampleApp/Makefile
index 04d98a351..53851f0b3 100644
--- a/Util/samples/SampleApp/Makefile
+++ b/Util/samples/SampleApp/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Util/samples/SampleApp/Makefile#1 $
+# $Id: //poco/Main/Util/samples/SampleApp/Makefile#3 $
 #
 # Makefile for Poco SampleApp
 #
diff --git a/Util/samples/SampleApp/SampleApp.vmsbuild b/Util/samples/SampleApp/SampleApp.vmsbuild
index dffdace5f..b3d9a8f5d 100644
--- a/Util/samples/SampleApp/SampleApp.vmsbuild
+++ b/Util/samples/SampleApp/SampleApp.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/1.3/Util/samples/SampleApp/SampleApp.vmsbuild#1 $
+# $Id: //poco/Main/Util/samples/SampleApp/SampleApp.vmsbuild#2 $
 #
 EXE=SampleApp
 SampleApp
diff --git a/Util/samples/SampleApp/src/SampleApp.cpp b/Util/samples/SampleApp/src/SampleApp.cpp
index 752394176..e617cc637 100644
--- a/Util/samples/SampleApp/src/SampleApp.cpp
+++ b/Util/samples/SampleApp/src/SampleApp.cpp
@@ -1,7 +1,7 @@
 //
 // SampleApp.cpp
 //
-// $Id: //poco/1.3/Util/samples/SampleApp/src/SampleApp.cpp#1 $
+// $Id: //poco/Main/Util/samples/SampleApp/src/SampleApp.cpp#10 $
 //
 // This sample demonstrates the Application class.
 //
diff --git a/Util/samples/SampleServer/Makefile b/Util/samples/SampleServer/Makefile
index d127454d4..668cd9a4c 100644
--- a/Util/samples/SampleServer/Makefile
+++ b/Util/samples/SampleServer/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Util/samples/SampleServer/Makefile#1 $
+# $Id: //poco/Main/Util/samples/SampleServer/Makefile#3 $
 #
 # Makefile for Poco SampleServer
 #
diff --git a/Util/samples/SampleServer/SampleServer.vmsbuild b/Util/samples/SampleServer/SampleServer.vmsbuild
index 6e10217bf..9f7d70e8f 100644
--- a/Util/samples/SampleServer/SampleServer.vmsbuild
+++ b/Util/samples/SampleServer/SampleServer.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/1.3/Util/samples/SampleServer/SampleServer.vmsbuild#1 $
+# $Id: //poco/Main/Util/samples/SampleServer/SampleServer.vmsbuild#1 $
 #
 EXE=SampleServer
 SampleServer
diff --git a/Util/samples/SampleServer/src/SampleServer.cpp b/Util/samples/SampleServer/src/SampleServer.cpp
index 48673bdac..4eaa594ec 100644
--- a/Util/samples/SampleServer/src/SampleServer.cpp
+++ b/Util/samples/SampleServer/src/SampleServer.cpp
@@ -1,7 +1,7 @@
 //
 // SampleServer.cpp
 //
-// $Id: //poco/1.3/Util/samples/SampleServer/src/SampleServer.cpp#1 $
+// $Id: //poco/Main/Util/samples/SampleServer/src/SampleServer.cpp#9 $
 //
 // This sample demonstrates the ServerApplication class.
 //
diff --git a/Util/src/AbstractConfiguration.cpp b/Util/src/AbstractConfiguration.cpp
index ba6f4a4ea..3421cc7cf 100644
--- a/Util/src/AbstractConfiguration.cpp
+++ b/Util/src/AbstractConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // AbstractConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/AbstractConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/AbstractConfiguration.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/Application.cpp b/Util/src/Application.cpp
index 06d5a43f2..f6b3c73fe 100644
--- a/Util/src/Application.cpp
+++ b/Util/src/Application.cpp
@@ -1,7 +1,7 @@
 //
 // Application.cpp
 //
-// $Id: //poco/1.3/Util/src/Application.cpp#2 $
+// $Id: //poco/Main/Util/src/Application.cpp#25 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/src/ConfigurationMapper.cpp b/Util/src/ConfigurationMapper.cpp
index 16b2f72cf..2a337052b 100644
--- a/Util/src/ConfigurationMapper.cpp
+++ b/Util/src/ConfigurationMapper.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapper.cpp
 //
-// $Id: //poco/1.3/Util/src/ConfigurationMapper.cpp#1 $
+// $Id: //poco/Main/Util/src/ConfigurationMapper.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/ConfigurationView.cpp b/Util/src/ConfigurationView.cpp
index 0fe8b15b0..ba1dfde59 100644
--- a/Util/src/ConfigurationView.cpp
+++ b/Util/src/ConfigurationView.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationView.cpp
 //
-// $Id: //poco/1.3/Util/src/ConfigurationView.cpp#1 $
+// $Id: //poco/Main/Util/src/ConfigurationView.cpp#7 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/FilesystemConfiguration.cpp b/Util/src/FilesystemConfiguration.cpp
index c0fb995bd..1617fd858 100644
--- a/Util/src/FilesystemConfiguration.cpp
+++ b/Util/src/FilesystemConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // FilesystemConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/FilesystemConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/FilesystemConfiguration.cpp#7 $
 //
 // Library: Util
 // Package: Configuration
@@ -36,6 +36,7 @@
 
 #include "Poco/Util/FilesystemConfiguration.h"
 #include "Poco/File.h"
+#include "Poco/Path.h"
 #include "Poco/DirectoryIterator.h"
 #include "Poco/StringTokenizer.h"
 #include "Poco/Exception.h"
@@ -80,7 +81,7 @@ bool FilesystemConfiguration::getRaw(const std::string& key, std::string& value)
 	if (f.exists())
 	{
 		value.reserve((std::string::size_type) f.getSize());
-		std::ifstream istr(p.toString().c_str());
+		std::ifstream istr(Path::transcode(p.toString()).c_str());
 		int c = istr.get();
 		while (c != std::char_traits<char>::eof())
 		{
@@ -99,7 +100,7 @@ void FilesystemConfiguration::setRaw(const std::string& key, const std::string&
 	File dir(p);
 	dir.createDirectories();
 	p.setFileName("data");
-	std::ofstream ostr(p.toString().c_str());
+	std::ofstream ostr(Path::transcode(p.toString()).c_str());
 	ostr.write(value.data(), (std::streamsize) value.length());
 }
 
diff --git a/Util/src/HelpFormatter.cpp b/Util/src/HelpFormatter.cpp
index 194c243c7..cb2627179 100644
--- a/Util/src/HelpFormatter.cpp
+++ b/Util/src/HelpFormatter.cpp
@@ -1,7 +1,7 @@
 //
 // HelpFormatter.cpp
 //
-// $Id: //poco/1.3/Util/src/HelpFormatter.cpp#1 $
+// $Id: //poco/Main/Util/src/HelpFormatter.cpp#7 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/IniFileConfiguration.cpp b/Util/src/IniFileConfiguration.cpp
index 95e63c973..184f2cd0c 100644
--- a/Util/src/IniFileConfiguration.cpp
+++ b/Util/src/IniFileConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // IniFileConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/IniFileConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/IniFileConfiguration.cpp#7 $
 //
 // Library: Util
 // Package: Configuration
@@ -37,6 +37,7 @@
 #include "Poco/Util/IniFileConfiguration.h"
 #include "Poco/Exception.h"
 #include "Poco/String.h"
+#include "Poco/Path.h"
 #include <fstream>
 #include <locale>
 #include <set>
@@ -44,6 +45,7 @@
 
 using Poco::icompare;
 using Poco::trim;
+using Poco::Path;
 
 
 namespace Poco {
@@ -85,7 +87,7 @@ void IniFileConfiguration::load(std::istream& istr)
 
 void IniFileConfiguration::load(const std::string& path)
 {
-	std::ifstream istr(path.c_str());
+	std::ifstream istr(Path::transcode(path).c_str());
 	if (istr.good())
 		load(istr);
 	else
diff --git a/Util/src/IntValidator.cpp b/Util/src/IntValidator.cpp
index 1ac96f530..48f512fd9 100644
--- a/Util/src/IntValidator.cpp
+++ b/Util/src/IntValidator.cpp
@@ -1,7 +1,7 @@
 //
 // IntValidator.cpp
 //
-// $Id: //poco/1.3/Util/src/IntValidator.cpp#1 $
+// $Id: //poco/Main/Util/src/IntValidator.cpp#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/LayeredConfiguration.cpp b/Util/src/LayeredConfiguration.cpp
index b2d827ae3..460aa01bd 100644
--- a/Util/src/LayeredConfiguration.cpp
+++ b/Util/src/LayeredConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // LayeredConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/LayeredConfiguration.cpp#2 $
+// $Id: //poco/Main/Util/src/LayeredConfiguration.cpp#8 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/LoggingConfigurator.cpp b/Util/src/LoggingConfigurator.cpp
index f4b50167b..714b1b2c3 100644
--- a/Util/src/LoggingConfigurator.cpp
+++ b/Util/src/LoggingConfigurator.cpp
@@ -1,7 +1,7 @@
 //
 // LoggingConfigurator.cpp
 //
-// $Id: //poco/1.3/Util/src/LoggingConfigurator.cpp#1 $
+// $Id: //poco/Main/Util/src/LoggingConfigurator.cpp#12 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/LoggingSubsystem.cpp b/Util/src/LoggingSubsystem.cpp
index 5afd79500..9d4985339 100644
--- a/Util/src/LoggingSubsystem.cpp
+++ b/Util/src/LoggingSubsystem.cpp
@@ -1,7 +1,7 @@
 //
 // LoggingSubsystem.cpp
 //
-// $Id: //poco/1.3/Util/src/LoggingSubsystem.cpp#1 $
+// $Id: //poco/Main/Util/src/LoggingSubsystem.cpp#8 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/src/MapConfiguration.cpp b/Util/src/MapConfiguration.cpp
index bb4883d77..53056aa6b 100644
--- a/Util/src/MapConfiguration.cpp
+++ b/Util/src/MapConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // MapConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/MapConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/MapConfiguration.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/Option.cpp b/Util/src/Option.cpp
index cd2efbd79..8bec6724b 100644
--- a/Util/src/Option.cpp
+++ b/Util/src/Option.cpp
@@ -1,7 +1,7 @@
 //
 // Option.cpp
 //
-// $Id: //poco/1.3/Util/src/Option.cpp#2 $
+// $Id: //poco/Main/Util/src/Option.cpp#10 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionCallback.cpp b/Util/src/OptionCallback.cpp
index 8b53d5f01..00448fe7a 100644
--- a/Util/src/OptionCallback.cpp
+++ b/Util/src/OptionCallback.cpp
@@ -1,7 +1,7 @@
 //
 // OptionCallback.cpp
 //
-// $Id: //poco/1.3/Util/src/OptionCallback.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionCallback.cpp#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionException.cpp b/Util/src/OptionException.cpp
index b723c58d4..9e2c456ab 100644
--- a/Util/src/OptionException.cpp
+++ b/Util/src/OptionException.cpp
@@ -1,7 +1,7 @@
 //
 // OptionException.cpp
 //
-// $Id: //poco/1.3/Util/src/OptionException.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionException.cpp#8 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionProcessor.cpp b/Util/src/OptionProcessor.cpp
index 441e3d68e..2d49c748d 100644
--- a/Util/src/OptionProcessor.cpp
+++ b/Util/src/OptionProcessor.cpp
@@ -1,7 +1,7 @@
 //
 // OptionProcessor.cpp
 //
-// $Id: //poco/1.3/Util/src/OptionProcessor.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionProcessor.cpp#8 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionSet.cpp b/Util/src/OptionSet.cpp
index ff644c39c..336553359 100644
--- a/Util/src/OptionSet.cpp
+++ b/Util/src/OptionSet.cpp
@@ -1,7 +1,7 @@
 //
 // OptionSet.cpp
 //
-// $Id: //poco/1.3/Util/src/OptionSet.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionSet.cpp#8 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/PropertyFileConfiguration.cpp b/Util/src/PropertyFileConfiguration.cpp
index 48b0d55b5..9a6a67540 100644
--- a/Util/src/PropertyFileConfiguration.cpp
+++ b/Util/src/PropertyFileConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // PropertyFileConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/PropertyFileConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/PropertyFileConfiguration.cpp#7 $
 //
 // Library: Util
 // Package: Configuration
@@ -37,11 +37,13 @@
 #include "Poco/Util/PropertyFileConfiguration.h"
 #include "Poco/Exception.h"
 #include "Poco/String.h"
+#include "Poco/Path.h"
 #include <fstream>
 #include <locale>
 
 
 using Poco::trim;
+using Poco::Path;
 
 
 namespace Poco {
@@ -82,7 +84,7 @@ void PropertyFileConfiguration::load(std::istream& istr)
 	
 void PropertyFileConfiguration::load(const std::string& path)
 {
-	std::ifstream istr(path.c_str());
+	std::ifstream istr(Path::transcode(path).c_str());
 	if (istr.good())
 		load(istr);
 	else
@@ -104,7 +106,7 @@ void PropertyFileConfiguration::save(std::ostream& ostr) const
 
 void PropertyFileConfiguration::save(const std::string& path) const
 {
-	std::ofstream ostr(path.c_str());
+	std::ofstream ostr(Path::transcode(path).c_str());
 	if (ostr.good())
 	{
 		save(ostr);
diff --git a/Util/src/RegExpValidator.cpp b/Util/src/RegExpValidator.cpp
index 131be924e..16caa4b82 100644
--- a/Util/src/RegExpValidator.cpp
+++ b/Util/src/RegExpValidator.cpp
@@ -1,7 +1,7 @@
 //
 // RegExpValidator.cpp
 //
-// $Id: //poco/1.3/Util/src/RegExpValidator.cpp#1 $
+// $Id: //poco/Main/Util/src/RegExpValidator.cpp#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/ServerApplication.cpp b/Util/src/ServerApplication.cpp
index 0de9ccdc1..7b2092000 100644
--- a/Util/src/ServerApplication.cpp
+++ b/Util/src/ServerApplication.cpp
@@ -1,7 +1,7 @@
 //
 // ServerApplication.cpp
 //
-// $Id: //poco/1.3/Util/src/ServerApplication.cpp#2 $
+// $Id: //poco/Main/Util/src/ServerApplication.cpp#18 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/src/Subsystem.cpp b/Util/src/Subsystem.cpp
index e7341b5b0..a53fe0ecd 100644
--- a/Util/src/Subsystem.cpp
+++ b/Util/src/Subsystem.cpp
@@ -1,7 +1,7 @@
 //
 // Subsystem.cpp
 //
-// $Id: //poco/1.3/Util/src/Subsystem.cpp#1 $
+// $Id: //poco/Main/Util/src/Subsystem.cpp#7 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/src/SystemConfiguration.cpp b/Util/src/SystemConfiguration.cpp
index 9ae1442db..2c2241096 100644
--- a/Util/src/SystemConfiguration.cpp
+++ b/Util/src/SystemConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // SystemConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/SystemConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/SystemConfiguration.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/Validator.cpp b/Util/src/Validator.cpp
index 366db7ff6..565b3053f 100644
--- a/Util/src/Validator.cpp
+++ b/Util/src/Validator.cpp
@@ -1,7 +1,7 @@
 //
 // Validator.cpp
 //
-// $Id: //poco/1.3/Util/src/Validator.cpp#1 $
+// $Id: //poco/Main/Util/src/Validator.cpp#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/WinRegistryConfiguration.cpp b/Util/src/WinRegistryConfiguration.cpp
index 12d205af3..879b8525f 100644
--- a/Util/src/WinRegistryConfiguration.cpp
+++ b/Util/src/WinRegistryConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // WinRegistryConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/WinRegistryConfiguration.cpp#2 $
+// $Id: //poco/Main/Util/src/WinRegistryConfiguration.cpp#6 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp
index 1756d9e19..d3c45d257 100644
--- a/Util/src/WinRegistryKey.cpp
+++ b/Util/src/WinRegistryKey.cpp
@@ -1,7 +1,7 @@
 //
 // WinRegistryKey.cpp
 //
-// $Id: //poco/1.3/Util/src/WinRegistryKey.cpp#1 $
+// $Id: //poco/Main/Util/src/WinRegistryKey.cpp#11 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/src/WinService.cpp b/Util/src/WinService.cpp
index 5988098b4..6d8e0d940 100644
--- a/Util/src/WinService.cpp
+++ b/Util/src/WinService.cpp
@@ -1,7 +1,7 @@
 //
 // WinService.cpp
 //
-// $Id: //poco/1.3/Util/src/WinService.cpp#1 $
+// $Id: //poco/Main/Util/src/WinService.cpp#9 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/src/XMLConfiguration.cpp b/Util/src/XMLConfiguration.cpp
index dbbbf66e7..a085b6bb7 100644
--- a/Util/src/XMLConfiguration.cpp
+++ b/Util/src/XMLConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // XMLConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/XMLConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/XMLConfiguration.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/testsuite/Makefile b/Util/testsuite/Makefile
index e91512547..afeb5af97 100644
--- a/Util/testsuite/Makefile
+++ b/Util/testsuite/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Util/testsuite/Makefile#1 $
+# $Id: //poco/Main/Util/testsuite/Makefile#5 $
 #
 # Makefile for Poco Util testsuite
 #
diff --git a/Util/testsuite/TestSuite.vmsbuild b/Util/testsuite/TestSuite.vmsbuild
index e8065f43d..6667fc24e 100644
--- a/Util/testsuite/TestSuite.vmsbuild
+++ b/Util/testsuite/TestSuite.vmsbuild
@@ -1,7 +1,7 @@
 #
 # TestSuite.vmsbuild
 #
-# $Id: //poco/1.3/Util/testsuite/TestSuite.vmsbuild#1 $
+# $Id: //poco/Main/Util/testsuite/TestSuite.vmsbuild#3 $
 #
 EXE=TestRunner
 AbstractConfigurationTest 
diff --git a/Util/testsuite/src/AbstractConfigurationTest.cpp b/Util/testsuite/src/AbstractConfigurationTest.cpp
index 22d05c5b5..c68d9965e 100644
--- a/Util/testsuite/src/AbstractConfigurationTest.cpp
+++ b/Util/testsuite/src/AbstractConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // AbstractConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/AbstractConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/AbstractConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/AbstractConfigurationTest.h b/Util/testsuite/src/AbstractConfigurationTest.h
index 93e436df0..d95a9e428 100644
--- a/Util/testsuite/src/AbstractConfigurationTest.h
+++ b/Util/testsuite/src/AbstractConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // AbstractConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/AbstractConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/AbstractConfigurationTest.h#5 $
 //
 // Definition of the AbstractConfigurationTest class.
 //
diff --git a/Util/testsuite/src/ConfigurationMapperTest.cpp b/Util/testsuite/src/ConfigurationMapperTest.cpp
index fb2b75bb2..4c2714df4 100644
--- a/Util/testsuite/src/ConfigurationMapperTest.cpp
+++ b/Util/testsuite/src/ConfigurationMapperTest.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapperTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/ConfigurationMapperTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/ConfigurationMapperTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/ConfigurationMapperTest.h b/Util/testsuite/src/ConfigurationMapperTest.h
index cd5e765ab..f710a3450 100644
--- a/Util/testsuite/src/ConfigurationMapperTest.h
+++ b/Util/testsuite/src/ConfigurationMapperTest.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapperTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/ConfigurationMapperTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/ConfigurationMapperTest.h#5 $
 //
 // Definition of the ConfigurationMapperTest class.
 //
diff --git a/Util/testsuite/src/ConfigurationTestSuite.cpp b/Util/testsuite/src/ConfigurationTestSuite.cpp
index 3a0c7c8d5..ad0da7e98 100644
--- a/Util/testsuite/src/ConfigurationTestSuite.cpp
+++ b/Util/testsuite/src/ConfigurationTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationTestSuite.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/ConfigurationTestSuite.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/ConfigurationTestSuite.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/ConfigurationTestSuite.h b/Util/testsuite/src/ConfigurationTestSuite.h
index 18ea36f5f..55393aa7d 100644
--- a/Util/testsuite/src/ConfigurationTestSuite.h
+++ b/Util/testsuite/src/ConfigurationTestSuite.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationTestSuite.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/ConfigurationTestSuite.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/ConfigurationTestSuite.h#4 $
 //
 // Definition of the ConfigurationTestSuite class.
 //
diff --git a/Util/testsuite/src/ConfigurationViewTest.cpp b/Util/testsuite/src/ConfigurationViewTest.cpp
index 314ccf4e7..04a1ceacb 100644
--- a/Util/testsuite/src/ConfigurationViewTest.cpp
+++ b/Util/testsuite/src/ConfigurationViewTest.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationViewTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/ConfigurationViewTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/ConfigurationViewTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/ConfigurationViewTest.h b/Util/testsuite/src/ConfigurationViewTest.h
index 048ff2d82..547b90ca0 100644
--- a/Util/testsuite/src/ConfigurationViewTest.h
+++ b/Util/testsuite/src/ConfigurationViewTest.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationViewTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/ConfigurationViewTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/ConfigurationViewTest.h#5 $
 //
 // Definition of the ConfigurationViewTest class.
 //
diff --git a/Util/testsuite/src/Driver.cpp b/Util/testsuite/src/Driver.cpp
index 2605d4df4..1f81c4e17 100644
--- a/Util/testsuite/src/Driver.cpp
+++ b/Util/testsuite/src/Driver.cpp
@@ -1,7 +1,7 @@
 //
 // Driver.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/Driver.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/Driver.cpp#5 $
 //
 // Console-based test driver for Poco Util.
 //
diff --git a/Util/testsuite/src/FilesystemConfigurationTest.cpp b/Util/testsuite/src/FilesystemConfigurationTest.cpp
index d6863454f..e1c8e320c 100644
--- a/Util/testsuite/src/FilesystemConfigurationTest.cpp
+++ b/Util/testsuite/src/FilesystemConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // FilesystemConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/FilesystemConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/FilesystemConfigurationTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/FilesystemConfigurationTest.h b/Util/testsuite/src/FilesystemConfigurationTest.h
index ab0944ce1..03c23fb9a 100644
--- a/Util/testsuite/src/FilesystemConfigurationTest.h
+++ b/Util/testsuite/src/FilesystemConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // FilesystemConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/FilesystemConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/FilesystemConfigurationTest.h#4 $
 //
 // Definition of the FilesystemConfigurationTest class.
 //
diff --git a/Util/testsuite/src/HelpFormatterTest.cpp b/Util/testsuite/src/HelpFormatterTest.cpp
index 81552be11..80d91e0b8 100644
--- a/Util/testsuite/src/HelpFormatterTest.cpp
+++ b/Util/testsuite/src/HelpFormatterTest.cpp
@@ -1,7 +1,7 @@
 //
 // HelpFormatterTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/HelpFormatterTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/HelpFormatterTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/HelpFormatterTest.h b/Util/testsuite/src/HelpFormatterTest.h
index 49ed790d8..af883e753 100644
--- a/Util/testsuite/src/HelpFormatterTest.h
+++ b/Util/testsuite/src/HelpFormatterTest.h
@@ -1,7 +1,7 @@
 //
 // HelpFormatterTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/HelpFormatterTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/HelpFormatterTest.h#4 $
 //
 // Definition of the HelpFormatterTest class.
 //
diff --git a/Util/testsuite/src/IniFileConfigurationTest.cpp b/Util/testsuite/src/IniFileConfigurationTest.cpp
index 0f9f9032b..b35b13dd4 100644
--- a/Util/testsuite/src/IniFileConfigurationTest.cpp
+++ b/Util/testsuite/src/IniFileConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // IniFileConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/IniFileConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/IniFileConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/IniFileConfigurationTest.h b/Util/testsuite/src/IniFileConfigurationTest.h
index 05f9608e5..ee2d648b6 100644
--- a/Util/testsuite/src/IniFileConfigurationTest.h
+++ b/Util/testsuite/src/IniFileConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // IniFileConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/IniFileConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/IniFileConfigurationTest.h#4 $
 //
 // Definition of the IniFileConfigurationTest class.
 //
diff --git a/Util/testsuite/src/LayeredConfigurationTest.cpp b/Util/testsuite/src/LayeredConfigurationTest.cpp
index 884372ece..63f8eca04 100644
--- a/Util/testsuite/src/LayeredConfigurationTest.cpp
+++ b/Util/testsuite/src/LayeredConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // LayeredConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/LayeredConfigurationTest.cpp#2 $
+// $Id: //poco/Main/Util/testsuite/src/LayeredConfigurationTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/LayeredConfigurationTest.h b/Util/testsuite/src/LayeredConfigurationTest.h
index d845eafda..d497ef95c 100644
--- a/Util/testsuite/src/LayeredConfigurationTest.h
+++ b/Util/testsuite/src/LayeredConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // LayeredConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/LayeredConfigurationTest.h#2 $
+// $Id: //poco/Main/Util/testsuite/src/LayeredConfigurationTest.h#5 $
 //
 // Definition of the LayeredConfigurationTest class.
 //
diff --git a/Util/testsuite/src/LoggingConfiguratorTest.cpp b/Util/testsuite/src/LoggingConfiguratorTest.cpp
index ac0abdf17..a4a5fb196 100644
--- a/Util/testsuite/src/LoggingConfiguratorTest.cpp
+++ b/Util/testsuite/src/LoggingConfiguratorTest.cpp
@@ -1,7 +1,7 @@
 //
 // LoggingConfiguratorTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/LoggingConfiguratorTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/LoggingConfiguratorTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/LoggingConfiguratorTest.h b/Util/testsuite/src/LoggingConfiguratorTest.h
index 39f173438..1b474b934 100644
--- a/Util/testsuite/src/LoggingConfiguratorTest.h
+++ b/Util/testsuite/src/LoggingConfiguratorTest.h
@@ -1,7 +1,7 @@
 //
 // LoggingConfiguratorTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/LoggingConfiguratorTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/LoggingConfiguratorTest.h#4 $
 //
 // Definition of the LoggingConfiguratorTest class.
 //
diff --git a/Util/testsuite/src/MapConfigurationTest.cpp b/Util/testsuite/src/MapConfigurationTest.cpp
index b48069cdd..8fee35976 100644
--- a/Util/testsuite/src/MapConfigurationTest.cpp
+++ b/Util/testsuite/src/MapConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // MapConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/MapConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/MapConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/MapConfigurationTest.h b/Util/testsuite/src/MapConfigurationTest.h
index 9a30c1b99..40fd67d2a 100644
--- a/Util/testsuite/src/MapConfigurationTest.h
+++ b/Util/testsuite/src/MapConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // MapConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/MapConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/MapConfigurationTest.h#4 $
 //
 // Definition of the MapConfigurationTest class.
 //
diff --git a/Util/testsuite/src/OptionProcessorTest.cpp b/Util/testsuite/src/OptionProcessorTest.cpp
index 5b3a7b520..613f8d5f2 100644
--- a/Util/testsuite/src/OptionProcessorTest.cpp
+++ b/Util/testsuite/src/OptionProcessorTest.cpp
@@ -1,7 +1,7 @@
 //
 // OptionProcessorTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionProcessorTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionProcessorTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/OptionProcessorTest.h b/Util/testsuite/src/OptionProcessorTest.h
index caea2740b..eaf1a4136 100644
--- a/Util/testsuite/src/OptionProcessorTest.h
+++ b/Util/testsuite/src/OptionProcessorTest.h
@@ -1,7 +1,7 @@
 //
 // OptionProcessorTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionProcessorTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionProcessorTest.h#5 $
 //
 // Definition of the OptionProcessorTest class.
 //
diff --git a/Util/testsuite/src/OptionSetTest.cpp b/Util/testsuite/src/OptionSetTest.cpp
index acb203a92..27fbb9c07 100644
--- a/Util/testsuite/src/OptionSetTest.cpp
+++ b/Util/testsuite/src/OptionSetTest.cpp
@@ -1,7 +1,7 @@
 //
 // OptionSetTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionSetTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionSetTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/OptionSetTest.h b/Util/testsuite/src/OptionSetTest.h
index 62ca9313d..dae432c44 100644
--- a/Util/testsuite/src/OptionSetTest.h
+++ b/Util/testsuite/src/OptionSetTest.h
@@ -1,7 +1,7 @@
 //
 // OptionSetTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionSetTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionSetTest.h#4 $
 //
 // Definition of the OptionSetTest class.
 //
diff --git a/Util/testsuite/src/OptionTest.cpp b/Util/testsuite/src/OptionTest.cpp
index 2050d37f5..399a0189a 100644
--- a/Util/testsuite/src/OptionTest.cpp
+++ b/Util/testsuite/src/OptionTest.cpp
@@ -1,7 +1,7 @@
 //
 // OptionTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/OptionTest.h b/Util/testsuite/src/OptionTest.h
index e963f8652..77aac1e44 100644
--- a/Util/testsuite/src/OptionTest.h
+++ b/Util/testsuite/src/OptionTest.h
@@ -1,7 +1,7 @@
 //
 // OptionTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionTest.h#4 $
 //
 // Definition of the OptionTest class.
 //
diff --git a/Util/testsuite/src/OptionsTestSuite.cpp b/Util/testsuite/src/OptionsTestSuite.cpp
index 29736aae9..af7913e35 100644
--- a/Util/testsuite/src/OptionsTestSuite.cpp
+++ b/Util/testsuite/src/OptionsTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // OptionsTestSuite.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionsTestSuite.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionsTestSuite.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/OptionsTestSuite.h b/Util/testsuite/src/OptionsTestSuite.h
index 88153af57..5556fd9e3 100644
--- a/Util/testsuite/src/OptionsTestSuite.h
+++ b/Util/testsuite/src/OptionsTestSuite.h
@@ -1,7 +1,7 @@
 //
 // OptionsTestSuite.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/OptionsTestSuite.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/OptionsTestSuite.h#4 $
 //
 // Definition of the OptionsTestSuite class.
 //
diff --git a/Util/testsuite/src/PropertyFileConfigurationTest.cpp b/Util/testsuite/src/PropertyFileConfigurationTest.cpp
index cacfd303c..3799f97c5 100644
--- a/Util/testsuite/src/PropertyFileConfigurationTest.cpp
+++ b/Util/testsuite/src/PropertyFileConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // PropertyFileConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/PropertyFileConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/PropertyFileConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/PropertyFileConfigurationTest.h b/Util/testsuite/src/PropertyFileConfigurationTest.h
index fb475735b..afb7197c1 100644
--- a/Util/testsuite/src/PropertyFileConfigurationTest.h
+++ b/Util/testsuite/src/PropertyFileConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // PropertyFileConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/PropertyFileConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/PropertyFileConfigurationTest.h#4 $
 //
 // Definition of the PropertyFileConfigurationTest class.
 //
diff --git a/Util/testsuite/src/SystemConfigurationTest.cpp b/Util/testsuite/src/SystemConfigurationTest.cpp
index 5124122a1..23f95f138 100644
--- a/Util/testsuite/src/SystemConfigurationTest.cpp
+++ b/Util/testsuite/src/SystemConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // SystemConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/SystemConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/SystemConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/SystemConfigurationTest.h b/Util/testsuite/src/SystemConfigurationTest.h
index 4fa82823a..502b4c220 100644
--- a/Util/testsuite/src/SystemConfigurationTest.h
+++ b/Util/testsuite/src/SystemConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // SystemConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/SystemConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/SystemConfigurationTest.h#4 $
 //
 // Definition of the SystemConfigurationTest class.
 //
diff --git a/Util/testsuite/src/UtilTestSuite.cpp b/Util/testsuite/src/UtilTestSuite.cpp
index cf7b6c140..46b57b3d4 100644
--- a/Util/testsuite/src/UtilTestSuite.cpp
+++ b/Util/testsuite/src/UtilTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // UtilTestSuite.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/UtilTestSuite.cpp#2 $
+// $Id: //poco/Main/Util/testsuite/src/UtilTestSuite.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/UtilTestSuite.h b/Util/testsuite/src/UtilTestSuite.h
index a0d43895c..1e77b4b2c 100644
--- a/Util/testsuite/src/UtilTestSuite.h
+++ b/Util/testsuite/src/UtilTestSuite.h
@@ -1,7 +1,7 @@
 //
 // UtilTestSuite.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/UtilTestSuite.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/UtilTestSuite.h#4 $
 //
 // Definition of the UtilTestSuite class.
 //
diff --git a/Util/testsuite/src/ValidatorTest.cpp b/Util/testsuite/src/ValidatorTest.cpp
index 45b5d76eb..99b6298b3 100644
--- a/Util/testsuite/src/ValidatorTest.cpp
+++ b/Util/testsuite/src/ValidatorTest.cpp
@@ -1,7 +1,7 @@
 //
 // ValidatorTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/ValidatorTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/ValidatorTest.cpp#1 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/ValidatorTest.h b/Util/testsuite/src/ValidatorTest.h
index a90c4d33c..4bcc6886c 100644
--- a/Util/testsuite/src/ValidatorTest.h
+++ b/Util/testsuite/src/ValidatorTest.h
@@ -1,7 +1,7 @@
 //
 // ValidatorTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/ValidatorTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/ValidatorTest.h#1 $
 //
 // Definition of the ValidatorTest class.
 //
diff --git a/Util/testsuite/src/WinConfigurationTest.cpp b/Util/testsuite/src/WinConfigurationTest.cpp
index fee448e85..b3c93d911 100644
--- a/Util/testsuite/src/WinConfigurationTest.cpp
+++ b/Util/testsuite/src/WinConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // WinConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/WinConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/WinConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/WinConfigurationTest.h b/Util/testsuite/src/WinConfigurationTest.h
index 0610ad386..acb13f04f 100644
--- a/Util/testsuite/src/WinConfigurationTest.h
+++ b/Util/testsuite/src/WinConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // WinConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/WinConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/WinConfigurationTest.h#4 $
 //
 // Definition of the WinConfigurationTest class.
 //
diff --git a/Util/testsuite/src/WinDriver.cpp b/Util/testsuite/src/WinDriver.cpp
index 93e38549c..b7ae7e878 100644
--- a/Util/testsuite/src/WinDriver.cpp
+++ b/Util/testsuite/src/WinDriver.cpp
@@ -1,7 +1,7 @@
 //
 // WinDriver.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/WinDriver.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/WinDriver.cpp#4 $
 //
 // Windows test driver for Poco Util.
 //
diff --git a/Util/testsuite/src/WinRegistryTest.cpp b/Util/testsuite/src/WinRegistryTest.cpp
index 93756f866..a6f8b61b1 100644
--- a/Util/testsuite/src/WinRegistryTest.cpp
+++ b/Util/testsuite/src/WinRegistryTest.cpp
@@ -1,7 +1,7 @@
 //
 // WinRegistryTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/WinRegistryTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/WinRegistryTest.cpp#7 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/WinRegistryTest.h b/Util/testsuite/src/WinRegistryTest.h
index 3a13f2153..8814bd998 100644
--- a/Util/testsuite/src/WinRegistryTest.h
+++ b/Util/testsuite/src/WinRegistryTest.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/WinRegistryTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/WinRegistryTest.h#4 $
 //
 // Definition of the WinRegistryTest class.
 //
diff --git a/Util/testsuite/src/WindowsTestSuite.cpp b/Util/testsuite/src/WindowsTestSuite.cpp
index 2d63ac6c4..7b0d137cc 100644
--- a/Util/testsuite/src/WindowsTestSuite.cpp
+++ b/Util/testsuite/src/WindowsTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // WindowsTestSuite.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/WindowsTestSuite.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/WindowsTestSuite.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/WindowsTestSuite.h b/Util/testsuite/src/WindowsTestSuite.h
index 15e2c3fb2..40807420e 100644
--- a/Util/testsuite/src/WindowsTestSuite.h
+++ b/Util/testsuite/src/WindowsTestSuite.h
@@ -1,7 +1,7 @@
 //
 // WindowsTestSuite.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/WindowsTestSuite.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/WindowsTestSuite.h#4 $
 //
 // Definition of the WindowsTestSuite class.
 //
diff --git a/Util/testsuite/src/XMLConfigurationTest.cpp b/Util/testsuite/src/XMLConfigurationTest.cpp
index e3aa72297..ebd1f63b1 100644
--- a/Util/testsuite/src/XMLConfigurationTest.cpp
+++ b/Util/testsuite/src/XMLConfigurationTest.cpp
@@ -1,7 +1,7 @@
 //
 // XMLConfigurationTest.cpp
 //
-// $Id: //poco/1.3/Util/testsuite/src/XMLConfigurationTest.cpp#1 $
+// $Id: //poco/Main/Util/testsuite/src/XMLConfigurationTest.cpp#5 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
diff --git a/Util/testsuite/src/XMLConfigurationTest.h b/Util/testsuite/src/XMLConfigurationTest.h
index 6d047683c..c7cb87b9e 100644
--- a/Util/testsuite/src/XMLConfigurationTest.h
+++ b/Util/testsuite/src/XMLConfigurationTest.h
@@ -1,7 +1,7 @@
 //
 // XMLConfigurationTest.h
 //
-// $Id: //poco/1.3/Util/testsuite/src/XMLConfigurationTest.h#1 $
+// $Id: //poco/Main/Util/testsuite/src/XMLConfigurationTest.h#4 $
 //
 // Definition of the XMLConfigurationTest class.
 //