shyouhei	2008-06-18 15:19:36 +0900 (Wed, 18 Jun 2008)

  New Revision: 17404

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/singleton.rb
    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) 17396:
    * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
      public methods only.  [ruby-core:17283]
    * object.c (convert_type): ditto.
    * lib/singleton.rb (Singleton#_dump): conversion method should be
      public.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17404&r2=17403&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/object.c?r1=17404&r2=17403&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17404&r2=17403&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/singleton.rb?r1=17404&r2=17403&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17404&r2=17403&diff_format=u