shyouhei	2008-06-15 23:20:59 +0900 (Sun, 15 Jun 2008)

  New Revision: 17329

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/marshal.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16596:
    * marshal.c (r_object0, Init_marshal): Fix the garbled s_call
      definition; fixes [ruby-dev:34843].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17329&r2=17328&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17329&r2=17328&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17329&r2=17328&diff_format=u