merges r31344 from trunk into ruby_1_9_2.

--
* win32/win32.c (kill): accept 0 as pid, fixes #4596

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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 632db447ab..1bc2ed8870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@yahoo.co.jp>
+
+	* win32/win32.c (kill): accept 0 as pid, fixes #4596
+
 Fri Apr 22 11:49:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
diff --git a/version.h b/version.h
index 5fa42d6d81..9bdee49a89 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 238
+#define RUBY_PATCHLEVEL 239
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
diff --git a/win32/win32.c b/win32/win32.c
index b1984f57fd..d696c0f016 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3743,7 +3743,7 @@ kill(int pid, int sig)
     int ret = 0;
     DWORD err;
 
-    if (pid <= 0) {
+    if (pid < 0) {
 	errno = EINVAL;
 	return -1;
     }