merges r20169 from trunk into ruby_1_9_1.

* lib/delegate.rb (Delegator.delegating_block): should not refer
  DelegateClass specific @delegate_dc_obj.  a patch from Erik
  Hollensbe in [ruby-core:19671].

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

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/delegate.rb b/lib/delegate.rb
index 353c68ee97..025e901a89 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -234,7 +234,7 @@ end
 def Delegator.delegating_block(mid)
   lambda do |*args, &block|
     begin
-      @delegate_dc_obj.__send__(mid, *args, &block)
+      __getobj__.__send__(mid, *args, &block)
     rescue
       re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o
       $!.backtrace.delete_if {|t| re =~ t}