Merge in [5392] and [5393] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5394 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/lib/breakpoint.rb

@@ -14,18 +14,20 @@
 # one that allows for commercial usage.) If you for
 # some good reason need to use this under another
 # license please contact me.
+"""
+foo
+bar
+"""
 
 require 'irb'
 if RUBY_VERSION == '1.8.5'
   begin
     require 'rubygems'
     require 'breakpoint185'
   rescue LoadError      
-    puts 'WARNING: breakpoints will not work with Ruby 1.8.5 without the call_stack gem.'
-    puts '         gem install call_stack or see http://eigenclass.org/hiki.rb?call_stack'
     def Binding.of_caller(&block)
-      raise 'Breakpoint requires the call_stack gem with Ruby 1.8.5.'
-      return
+      raise """Breakpoints do not work in Ruby 1.8.5 without call_stack.
+gem install call_stack or see http://eigenclass.org/hiki.rb?call_stack"""
     end
   end
 else