shyouhei	2008-06-15 23:31:47 +0900 (Sun, 15 Jun 2008)

  New Revision: 17345

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/zlib/extconf.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16677:


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17345&r2=17344&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/zlib/extconf.rb?r1=17345&r2=17344&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17345&r2=17344&diff_format=u