Merge branch 'master' into connector_plugin

Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs
index 067264d..e5186ae 100644
--- a/OpenSim/Tests/ConfigurationLoaderTest.cs
+++ b/OpenSim/Tests/ConfigurationLoaderTest.cs
@@ -29,11 +29,12 @@ using System.IO;
 using Nini.Config;
 using NUnit.Framework;
 using OpenSim.Framework;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Tests
 {
     [TestFixture]
-    public class ConfigurationLoaderTests
+    public class ConfigurationLoaderTests : OpenSimTestCase
     {
         private const string m_testSubdirectory = "test";
         private string m_basePath;