1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6acde0d7ed..9d6fca280c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 11 17:42:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* error.c (syserr_initialize): use mesg's encoding when locale
+	  encoding is US-ASCII. If locale encoding is not US-ASCII,
+	  assume err has non ASCII characters. [ruby-dev:42358]
+
 Mon Oct 11 14:03:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* error.c (syserr_initialize): set the encoding of Errno::*#message