shyouhei	2008-06-08 04:48:34 +0900 (Sun, 08 Jun 2008)

  New Revision: 16960

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/parse.y
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 14045, 14059:
    * parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
    * parse.y (newline_node): set line from outermost node before removing
      NODE_BEGIN.  [ruby-dev:32406]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16960&r2=16959&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/parse.y?r1=16960&r2=16959&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16960&r2=16959&diff_format=u