merges r23754 from trunk into ruby_1_9_1.

--
* lib/monitor.rb (MonitorMixin::extend_object): should use
  #__send__ instead of #send to avoid possible name conflict.  
  [ruby-core:23907]

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

3 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a22cda35..9a1b83d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 20 07:17:52 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/monitor.rb (MonitorMixin::extend_object): should use
+	  #__send__ instead of #send to avoid possible name conflict.  
+	  [ruby-core:23907]
+
 Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 31234819b..2f2bb1661 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -91,13 +91,13 @@ module MonitorMixin
       if timeout
         raise NotImplementedError, "timeout is not implemented yet"
       end
-      @monitor.send(:mon_check_owner)
-      count = @monitor.send(:mon_exit_for_cond)
+      @monitor.__send__(:mon_check_owner)
+      count = @monitor.__send__(:mon_exit_for_cond)
       begin
         @cond.wait(@monitor.instance_variable_get("@mon_mutex"))
         return true
       ensure
-        @monitor.send(:mon_enter_for_cond, count)
+        @monitor.__send__(:mon_enter_for_cond, count)
       end
     end
     
@@ -114,12 +114,12 @@ module MonitorMixin
     end
     
     def signal
-      @monitor.send(:mon_check_owner)
+      @monitor.__send__(:mon_check_owner)
       @cond.signal
     end
     
     def broadcast
-      @monitor.send(:mon_check_owner)
+      @monitor.__send__(:mon_check_owner)
       @cond.broadcast
     end
     
@@ -137,7 +137,7 @@ module MonitorMixin
   
   def self.extend_object(obj)
     super(obj)
-    obj.send(:mon_initialize)
+    obj.__send__(:mon_initialize)
   end
   
   #
diff --git a/version.h b/version.h
index a7a43a180..acd435a30 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 196
+#define RUBY_PATCHLEVEL 197
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1