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

diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index ba4e91525a6..aa198b86b40 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -79,6 +79,7 @@ IceBox::IceBoxService::start(int argc, char* argv[])
     }
 
     _serviceManager = new ServiceManagerI(communicator(), argc, argv);
+
     return _serviceManager->start();
 }