shyouhei	2007-05-23 01:45:03 +0900 (Wed, 23 May 2007)

  New Revision: 12316

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/net/imap.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge -c 12158

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/net/imap.rb?r1=12316&r2=12315
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=12316&r2=12315
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=12316&r2=12315