merges r24219 from trunk into ruby_1_9_1.

--
* lib/tracer.rb: toplevel caller exists now.  [ruby-core:24454]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 48c2c856d..75fab5174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 21 16:07:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tracer.rb: toplevel caller exists now.  [ruby-core:24454]
+
 Mon Jul 20 12:51:39 2009  wanabe  <s.wanabe@gmail.com>
 
 	* lib/matrix.rb (Matrix#rank): revert a part of r20859 to avoid
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 1fdc60896..76a8723ff 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -161,6 +161,6 @@ if $0 == __FILE__
   ARGV.shift
   Tracer.on
   require $0
-elsif caller(0).size == 1
+elsif caller.size == 1
   Tracer.on
 end
diff --git a/version.h b/version.h
index afb8dfe45..cb3ef7938 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 249
+#define RUBY_PATCHLEVEL 250
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1