merges r24620 from trunk into ruby_1_9_1. fixes the backport task #1976.

--
* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
  [ruby-dev:39153]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index bcf2417dbd..75667edfe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 22 01:29:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
+	  [ruby-dev:39153]
+
 Tue Oct 20 14:50:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_here_document): dispatch delayed heredoc