shyouhei	2007-05-23 05:19:40 +0900 (Wed, 23 May 2007)

  New Revision: 12331

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/iconv/iconv.c
    branches/ruby_1_8_6/version.h

  Log:
    merge -c 12272

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=12331&r2=12330
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=12331&r2=12330
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/iconv/iconv.c?r1=12331&r2=12330