shyouhei	2008-06-15 21:07:53 +0900 (Sun, 15 Jun 2008)

  New Revision: 17224

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

  Log:
    merge revision(s) 15869:
    * lib/resolv.rb (Resolv::Config.default_config_hash): requires
      win32/resolv to use Win32::Resolv.  [ruby-dev:34138]


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