merges r29544 from trunk into ruby_1_9_2.

--
* lib/net/telnet.rb (Net::Telnet#close): added.
  patched by Erik Hollensbe [ruby-dev:42260] #3830

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

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 88ec96645e..acf70d9bf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 21 15:42:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/telnet.rb (Net::Telnet#close): added.
+	  patched by Erik Hollensbe [ruby-dev:42260] #3830
+
 Wed Oct 27 18:27:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index f233827a59..a8ded93b9d 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -754,6 +754,10 @@ module Net
       line
     end
 
+    def close
+      @sock.close
+    end
+
   end  # class Telnet
 end  # module Net
 
diff --git a/version.h b/version.h
index 8e3e755f90..b25547578c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1