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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 2 deletions

diff --git a/lib/singleton.rb b/lib/singleton.rb
index 0ab8517275..31fb950378 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -70,8 +70,7 @@ module Singleton
   def dup
     raise TypeError, "can't dup instance of singleton #{self.class}"
   end
-  
-  private 
+
   #  default marshalling strategy
   def _dump(depth=-1) 
     ''