diff --git a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
similarity index 97%
rename from OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
rename to OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 799dcb9224..3ee9e1b63d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -31,16 +31,13 @@ using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.CoreModules.World.Archiver
+namespace OpenSim.Framework.Serialization.External
 {
     /// <summary>
     /// Serialize and deserialize region settings for an archive file format.
     /// </summary>
     /// We didn't simply use automatic .NET serializagion for OpenSim.Framework.RegionSettings since this is really
-    /// a file format rather than an object serialization.  
-    /// TODO: However, we could still have used separate non-framework classes here to read and write the xml
-    /// automatically rather than laboriously doing it by hand using XmlTextReader and Writer.  Should switch to this
-    /// in the future.
+    /// a file format rather than an object serialization.
     public class RegionSettingsSerializer
     {
         protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 8b603b4539..3f6e82297f 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -36,6 +36,7 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
+using OpenSim.Framework.Serialization.External;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index db74564cdf..85391b3989 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -34,6 +34,7 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
+using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e4fcc9c2f3..9f5932a3b3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -688,10 +688,10 @@ InterregionComms = "RESTComms"
 
 
 [Wind]
-	; Enables the wind module.  Default is true
-	enabled = true
-	; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.  Default is 1.0
-	strength = 1.0
+    ; Enables the wind module.  Default is true
+    enabled = true
+    ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.  Default is 1.0
+    strength = 1.0
 	
 
 [Trees]