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, 18 insertions, 0 deletions

diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index c7ca49ea899..cb01f17259f 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -258,6 +258,24 @@ Ice::CommunicatorI::flushBatchRequests()
     _instance->flushBatchRequests();
 }
 
+ObjectPrx
+Ice::CommunicatorI::getAdmin() const
+{
+    return _instance->getAdmin();
+}
+
+void
+Ice::CommunicatorI::addAdminFacet(const Ice::ObjectPtr& servant, const string& facet)
+{
+    _instance->addAdminFacet(servant, facet);
+}
+
+Ice::ObjectPtr
+Ice::CommunicatorI::removeAdminFacet(const string& facet)
+{
+    return _instance->removeAdminFacet(facet);
+}
+
 Ice::CommunicatorI::CommunicatorI(const InitializationData& initData)
 {
     __setNoDelete(true);