shyouhei	2007-05-23 00:14:54 +0900 (Wed, 23 May 2007)

  New Revision: 12312

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/socket/socket.c
    branches/ruby_1_8_5/version.h

  Log:
    merge -c 12137

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/socket/socket.c?r1=12312&r2=12311
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=12312&r2=12311
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=12312&r2=12311