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/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
index ee2b1de0e3a..57728bc8f0e 100644
--- a/cpp/src/Freeze/MapI.cpp
+++ b/cpp/src/Freeze/MapI.cpp
@@ -1313,6 +1313,7 @@ Freeze::MapHelperI::close()
 {
     if(_db != 0)
     {
+        closeAllIterators();
         _connection->unregisterMap(this);
     }
     _db = 0;