Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cs/src/Ice/Instance.cs

Removed conflicts. Added more tests. Changed stack
marshaling to reverse order during marshaling instead
of during unmarshaling.

1 files changed, 14 insertions, 0 deletions

diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index e75dd7fee26..8f8dd794376 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -245,6 +245,20 @@ IceBox::ServiceManagerI::start()
                 //
             }
         }
+
+        //
+        // Register "this" as a facet to the Admin object
+        //
+        try
+        {
+            _communicator->addAdminFacet(this, "IceBox.ServiceManager");
+        }
+        catch(const CommunicatorDestroyedException&)
+        {
+            //
+            // Ignored
+            //
+        }
     }
     catch(const FailureException& ex)
     {