2 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index b19e549..6e7bd1c 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -325,6 +325,8 @@ namespace OpenSim
                     Environment.Exit(1);
                 }
             }
+
+            configSource.Source.ExpandKeyValues();
             return success;
         }
 
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 69f13bf..650425b 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using Mono.Addins;
 [assembly: AssemblyVersion("0.8.1.*")]
 
 [assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VersionNumber)]
-[assembly: ImportAddinAssembly("Opensim.Framework.dll")]
+[assembly: ImportAddinAssembly("OpenSim.Framework.dll")]