1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 62bcbdd76..dcd2bbe11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 12 07:41:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_enc_compatible): If a string is empty and
+	  other's encoding is US-ASCII, returns the empty string's encoding.
+	  [ruby-list:46274]
+
 Wed Aug 12 07:38:12 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* encoding.c (is_data_encoding): fix condition.