3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e22c7e792..23c1628bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 21 21:47:34 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ext/pty/pty.c (getDevice): fixes a mistake in merging r20877.
+	  Patch by Takahiro Kambe <taca AT back-street.net>.
+
 Thu May 14 16:07:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_ungetbyte): encoding should no
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 6e6852aa7a..0cefa221c4 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -422,7 +422,7 @@ getDevice(int *master, int *slave, char SlaveName[DEVICELEN])
 	rb_gc();
 	get_device_once(master, slave, SlaveName, 1);
     }
-    return Qnil;
+    return;
 }
 
 /* ruby function: getpty */
diff --git a/version.h b/version.h
index bd1f11b142..7a598e42a9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 138
+#define RUBY_PATCHLEVEL 139
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1