Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 3 insertions, 3 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]
diff --git a/prebuild.xml b/prebuild.xml
index 2d35529..29d7c90 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1635,7 +1635,7 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
-      <Reference name="Ionic.Zip"/>
+      <Reference name="Ionic.Zip" path="../../../bin/"/>
       <Reference name="NDesk.Options" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>