merges r23424 from trunk into ruby_1_9_1.

--
* ext/stringio/stringio.c (strio_ungetbyte): encoding should not
  be effective.

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e74a8937..9e22c7e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 14 16:07:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_ungetbyte): encoding should no
+	  be effective.
+
 Sun May 10 11:36:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/dl/cfunc.c (rb_dlcfunc_instance_p): new function to check if