shyouhei	2008-06-15 23:28:00 +0900 (Sun, 15 Jun 2008)

  New Revision: 17341

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/marshal.c
    branches/ruby_1_8_5/object.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16654:
    * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
      private methods too.  [ruby-dev:34671]
    * object.c (convert_type): ditto.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17341&r2=17340&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/object.c?r1=17341&r2=17340&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17341&r2=17340&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17341&r2=17340&diff_format=u