merges r20646 and r20647 from trunk into ruby_1_9_1.

	* lib/cmath.rb (sqrt): should pass nan or infinity to the original
	  method.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 13696cd483..5e208739a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 11 23:48:00 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/cmath.rb (sqrt): should pass nan to the original method.
+
 Thu Dec 11 19:31:45 2008  Tanaka Akira  <akr@fsij.org>
 
 	* lib/test/unit/assertions.rb: extracted from lib/test/unit.rb.