merges r21592 from trunk into ruby_1_9_1.

* thread.c (thread_start_func_2): call ruby_cleanup() if thread is
  main thread.  [ruby-dev:37624]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fb5bfe05f..3c058898d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 16 12:24:39 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (thread_start_func_2): call ruby_cleanup() if thread is
+	  main thread.  [ruby-dev:37624]
+
 Fri Jan 16 12:27:50 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
diff --git a/thread.c b/thread.c
index 6459ba7a0..7acf191ff 100644
--- a/thread.c
+++ b/thread.c
@@ -463,7 +463,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
     }
     thread_cleanup_func(th);
     if (th->vm->main_thread == th) {
-	rb_thread_stop_timer_thread();
+	ruby_cleanup(state);
     }
     native_mutex_unlock(&th->vm->global_vm_lock);