shyouhei	2007-05-23 00:08:43 +0900 (Wed, 23 May 2007)

  New Revision: 12311

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

  Log:
    merge -c 12137

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