shyouhei	2008-06-15 20:20:41 +0900 (Sun, 15 Jun 2008)

  New Revision: 17204

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/numeric.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15749:
    * numeric.c (fix_coerce): try conversion before type check.
      [ruby-core:15838]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/numeric.c?r1=17204&r2=17203&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17204&r2=17203&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17204&r2=17203&diff_format=u