merge revision(s) 22429:

	* lib/soap/mimemessage.rb (MIMEMessage#to_s): Fix a fatal
	  method name typo. [Bug #1173]


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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4eaf56495b..0adff48046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 26 21:21:49 2009  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/soap/mimemessage.rb (MIMEMessage#to_s): Fix a fatal
+	  method name typo. [Bug #1173]
+
 Tue May 26 21:16:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_extname): fix for spaces before extention.
diff --git a/lib/soap/mimemessage.rb b/lib/soap/mimemessage.rb
index acb4322e11..e4960b0bff 100644
--- a/lib/soap/mimemessage.rb
+++ b/lib/soap/mimemessage.rb
@@ -232,7 +232,7 @@ class MIMEMessage
   end
 
   def to_s
-    str = headers_str + "\r\n\r\n" + conent_str
+    str = headers_str + "\r\n\r\n" + content_str
   end
 end
 
diff --git a/version.h b/version.h
index d2c65c53f0..1629602d8c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-05-26"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090526
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8