shyouhei	2008-06-15 22:08:42 +0900 (Sun, 15 Jun 2008)

  New Revision: 17240

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/syck/rubyext.c
    branches/ruby_1_8_5/lib/yaml/basenode.rb
    branches/ruby_1_8_5/lib/yaml/types.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16074:
    * ext/syck/rubyext.c: Node#value defined twice.
    * lib/yaml/: several method redefinitions causing warnings.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/syck/rubyext.c?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/yaml/basenode.rb?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/yaml/types.rb?r1=17240&r2=17239&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17240&r2=17239&diff_format=u