merges r29394 from trunk into ruby_1_9_2.

--
test/win32ole/test_thread.rb: add for win32ole with Thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 25 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f895bf8e5b..925555acb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct  2 22:59:32 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_thread.rb: add for win32ole with Thread.
+
 Thu Sep 30 16:11:08 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getenv): should return NULL if specified name
diff --git a/test/win32ole/test_thread.rb b/test/win32ole/test_thread.rb
new file mode 100644
index 0000000000..947d85af9e
--- /dev/null
+++ b/test/win32ole/test_thread.rb
@@ -0,0 +1,20 @@
+begin
+  require 'win32ole'
+rescue LoadError
+end
+require 'test/unit'
+
+if defined?(WIN32OLE)
+  class TestThread < Test::Unit::TestCase
+    #
+    # test for Bug #2618(ruby-core:27634)
+    #
+    def test_creating_win32ole_object_in_thread
+      t = Thread.new do
+        dict = WIN32OLE.new('Scripting.Dictionary')
+        assert(true)
+      end
+      t.join
+    end
+  end
+end
diff --git a/version.h b/version.h
index 32a63adad3..20b87a9cbe 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 56
+#define RUBY_PATCHLEVEL 57
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1