merges r23359 from trunk into ruby_1_9_1.

--
* array.c (rb_ary_sample): negative sample number is invalid.
  [ruby-core:23374]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index fbcaf9f6e..44bf80fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  7 14:26:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sample): negative sample number is invalid.
+	  [ruby-core:23374]
+
 Tue May 12 14:35:29 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* win32/Makefile.sub: fixes build failures on win32.