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, 1 deletions

diff --git a/version.h b/version.h
index 2b0af78080..ac4f71d6ee 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-18"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080618
-#define RUBY_PATCHLEVEL 225
+#define RUBY_PATCHLEVEL 226
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8