merges r24013 from trunk into ruby_1_9_1.

--
* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
  prototypes.  [ruby-dev:38756]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9968a48086..528bf38d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 10 11:41:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
+	  prototypes.  [ruby-dev:38756]
+
 Fri Jul 10 10:25:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_insnhelper.c (vm_search_superclass): checks for implici