Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	bin/OpenMetaverse.StructuredData.XML
	bin/OpenMetaverse.XML
	bin/OpenMetaverseTypes.XML

1 files changed, 2 insertions, 2 deletions

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index d932ce7..b98132e 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -18,13 +18,13 @@
         ; Set path to directory for plugin registry. Information
         ; about the registered repositories and installed plugins
         ; will be stored here
-        ; The Robust.exe process must hvae R/W access to the location 
+        ; The Robust.exe process must have R/W access to the location 
         RegistryLocation = "."
 
 
         ; Modular configurations
         ; Set path to directory for modular ini files...
-        ; The Robust.exe process must hvae R/W access to the location 
+        ; The Robust.exe process must have R/W access to the location 
         ConfigDirectory = "/home/opensim/etc/Configs"
 
 [ServiceList]