merges r24408 and r24409 from trunk into ruby_1_9_1.

--
* ruby.c (rb_stdio_set_default_encoding): declared.
--
* io.c (rb_stdio_set_default_encoding): prototyped.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 37583df1e7..c3d1d21701 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug  5 19:11:01 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (rb_stdio_set_default_encoding): declared.
+
 Wed Aug  5 18:46:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* debug.c (ruby_dummy_gdb_enums): made public.  [ruby-dev:39001]