merges r24361 from trunk into ruby_1_9_1.

--
* numeric.c (flo_hash): normalize -0.0 to 0.0.  [ruby-core:24577]

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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5231f7036..7f3f168ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug  3 13:05:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_{permutation,combination,product}): must not use
+	  ary_discard on strings.
+
 Sat Aug  1 19:23:27 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* string.c (tr_trans): change condition of singlebyte