merges r23070 from trunk into ruby_1_9_1.

--
* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
  --program-prefix and --program-suffix.  reapplied r19923.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4171fb6cc8..a12319fa91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 26 11:33:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
+	  --program-prefix and --program-suffix.  reapplied r19923.
+
 Mon Mar 23 21:41:14 2009  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/dbm/dbm.c (fdbm_initialize): Make the file variable