drbrain	2007-12-24 16:22:01 +0900 (Mon, 24 Dec 2007)

  New Revision: 14582

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/rdoc/ri/ri_options.rb
    branches/ruby_1_8/lib/rdoc/ri/ri_paths.rb

  Log:
    Merge r14565 and r14567 from trunk

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14582&r2=14581
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rdoc/ri/ri_options.rb?r1=14582&r2=14581
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/rdoc/ri/ri_paths.rb?r1=14582&r2=14581