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

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 188d90a..23d5945 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
 
                 }
 
-                        /// <summary>
+                /// <summary>
         /// Installs the plugin.
         /// </summary>
         /// <returns>
diff --git a/OpenSim/Server/Base/CommandManager.cs b/OpenSim/Server/Base/CommandManager.cs
index 88aac00..bd18485 100644
--- a/OpenSim/Server/Base/CommandManager.cs
+++ b/OpenSim/Server/Base/CommandManager.cs
@@ -32,8 +32,8 @@ using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Mono.Addins.Setup;
 using Mono.Addins;
-// using Mono.Addins.Setup;
 using Mono.Addins.Description;
 using OpenSim.Framework;