merges r23889 from trunk into ruby_1_9_1.

--
* file.c (file_expand_path): should copy original encoding.
  [ruby-dev:38612]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f1527cb9c..087e28804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 29 17:14:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): should copy original encoding.
+	  [ruby-dev:38612]
+
 Sat Jun 27 03:09:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (argf_rewind): need to rewind $. and ARGF.lineno.