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

diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/IceUtil/Timer.cpp
index fd80db92f2c..adca267c58e 100755
--- a/cpp/src/IceUtil/Timer.cpp
+++ b/cpp/src/IceUtil/Timer.cpp
@@ -152,8 +152,8 @@ Timer::run()
                 const Token& first = *(_tokens.begin());
                 if(first.scheduledTime <= now)
                 {
-                    _tokens.erase(_tokens.begin());
                     token = first;
+                    _tokens.erase(_tokens.begin());
                     if(token.delay == IceUtil::Time())
                     {
                         _tasks.erase(token.task);