shyouhei	2007-05-23 01:28:47 +0900 (Wed, 23 May 2007)

  New Revision: 12314

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/error.c
    branches/ruby_1_8_5/io.c
    branches/ruby_1_8_5/version.h

  Log:
    merge -r 12143:12147

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/error.c?r1=12314&r2=12313
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/io.c?r1=12314&r2=12313
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=12314&r2=12313
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=12314&r2=12313