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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5231f70365..7f3f168ca4 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
diff --git a/numeric.c b/numeric.c
index a3cb3be1c8..261c98ad12 100644
--- a/numeric.c
+++ b/numeric.c
@@ -897,6 +897,8 @@ flo_hash(VALUE num)
     int hash;
 
     d = RFLOAT_VALUE(num);
+    /* normalize -0.0 to 0.0 */
+    if (d == 0.0) d = 0.0;
     hash = rb_memhash(&d, sizeof(d));
     return INT2FIX(hash);
 }
diff --git a/version.h b/version.h
index e390575334..8cdb9da5b7 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 262
+#define RUBY_PATCHLEVEL 263
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1