merges r23560 from trunk into ruby_1_9_1.

--
* lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed.  a patch from
  Nobuhiro IMAI.  [ruby-dev:38538]

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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f637c7c8..69885b4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 25 05:32:19 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed.  a patch from
+	  Nobuhiro IMAI.  [ruby-dev:38538]
+
 Mon May 25 06:25:38 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 95cf423d8..51627d32a 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -33,7 +33,7 @@ class CGI
     "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
     "NOT_ACCEPTABLE"      => "406 Not Acceptable",
     "LENGTH_REQUIRED"     => "411 Length Required",
-    "PRECONDITION_FAILED" => "412 Rrecondition Failed",
+    "PRECONDITION_FAILED" => "412 Precondition Failed",
     "SERVER_ERROR"        => "500 Internal Server Error",
     "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
     "BAD_GATEWAY"         => "502 Bad Gateway",
diff --git a/version.h b/version.h
index 33ec0be1f..53715337a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 158
+#define RUBY_PATCHLEVEL 159
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1