merge revision(s) 26534:26536:

	* eval.c (proc_invoke): reverted r25975.  [ruby-dev:39931]
	  [ruby-dev:40059]
	* eval.c (rb_mod_define_method): return original block but not
	  bound block.  [ruby-core:26984]


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

1 files changed, 4 insertions, 4 deletions

diff --git a/version.h b/version.h
index 6f8d60c7c4..368efd3558 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-05-20"
+#define RUBY_RELEASE_DATE "2010-05-22"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100520
-#define RUBY_PATCHLEVEL 259
+#define RUBY_RELEASE_CODE 20100522
+#define RUBY_PATCHLEVEL 260
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];