shyouhei	2008-06-14 16:46:36 +0900 (Sat, 14 Jun 2008)

  New Revision: 17156

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/timeout.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15464:
    * lib/timeout.rb (Timeout::timeout): made sensitive to location on the
      stack.  [ruby-core:15458]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/timeout.rb?r1=17156&r2=17155&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17156&r2=17155&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17156&r2=17155&diff_format=u