nobu	2008-06-27 21:24:37 +0900 (Fri, 27 Jun 2008)

  New Revision: 17614

  Added files:
    branches/mvm/.merged-trunk-revision
  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/lib/erb.rb
    branches/mvm/parse.y
    branches/mvm/test/erb/test_erb.rb

  Log:
    * merge from trunk r17600:17612.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/lib/erb.rb?r1=17614&r2=17613&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/test/erb/test_erb.rb?r1=17614&r2=17613&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ChangeLog?r1=17614&r2=17613&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/parse.y?r1=17614&r2=17613&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/.merged-trunk-revision?revision=17614&view=markup
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/.merged-trunk-revision?r1=17614&r2=17613&diff_format=u