From df083b39d377838169c82ce464b849d2383ff27d Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Jul 2009 08:07:23 +0000
Subject: merges r24002 from trunk into ruby_1_9_1. -- Remove debug print.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 marshal.c | 1 -
 version.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/marshal.c b/marshal.c
index 0c49fd339..cbed195b5 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1374,7 +1374,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
 	    v = r_entry(rb_reg_new("", 0, options), arg);
 	    if (ivp) {
 		r_ivar(v, arg);
-		rb_p(v);
 		*ivp = Qfalse;
 	    }
 	    rb_enc_copy(str, v);
diff --git a/version.h b/version.h
index f267bef03..b6b3c9134 100644
--- a/version.h
+++ b/version.h
@@ -4,7 +4,7 @@
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 225
+#define RUBY_PATCHLEVEL 226
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 12
-- 
cgit