From 0d80a1ef1ccb96414353b811e60b7948fbf10837 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Dec 2008 01:02:59 +0000
Subject: merges r20629 from trunk into ruby_1_9_1. * lib/pathname.rb
 (Pathname#=~): undefed.  at asakusa.rb.   [ruby-core:19690]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 5 +++++
 lib/pathname.rb | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3aa248afd..440fe7223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 11 19:16:30 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pathname.rb (Pathname#=~): undefed.  at asakusa.rb.
+	  [ruby-core:19690]
+
 Thu Dec 11 13:09:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (reg_enc_error): raise EncodingCompatibilityError for
diff --git a/lib/pathname.rb b/lib/pathname.rb
index 1bc0063bb..86f0f5480 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -1063,6 +1063,10 @@ class Pathname    # * mixed *
   end
 end
 
+class Pathname
+  undef =~
+end
+
 module Kernel
   # create a pathname object.
   #
-- 
cgit