merge revision(s) 27400:

	* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
	  destroyed otherwise.


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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b800fcd68d..7a3ef1d7e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  8 15:33:30 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
+	  destroyed otherwise.
+
 Tue Jun  8 15:27:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (search_required): expand home relative path first.