diff --git a/ChangeLog b/ChangeLog
index 855dd70cfd..d4118fdacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 21 12:38:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_generic_ivar_memsize): should not remove generic
+	  instance variable table.
+
 Mon Jul 20 20:35:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* io.c (rb_f_open): add rdoc about specifying ext_enc as *-bom.
diff --git a/variable.c b/variable.c
index 1d8e4133c2..3bab278740 100644
--- a/variable.c
+++ b/variable.c
@@ -908,10 +908,10 @@ rb_mark_generic_ivar_tbl(void)
 void
 rb_free_generic_ivar(VALUE obj)
 {
-    st_data_t tbl;
+    st_data_t key = (st_data_t)obj, tbl;
 
     if (!generic_iv_tbl) return;
-    if (st_delete(generic_iv_tbl, &obj, &tbl))
+    if (st_delete(generic_iv_tbl, &key, &tbl))
 	st_free_table((st_table *)tbl);
 }
 
@@ -919,8 +919,8 @@ size_t
 rb_generic_ivar_memsize(VALUE obj)
 {
     st_data_t tbl;
-    if (st_delete(generic_iv_tbl, &obj, &tbl))
-      return st_memsize((st_table *)tbl);
+    if (st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl))
+	return st_memsize((st_table *)tbl);
     return 0;
 }
 
@@ -931,7 +931,7 @@ rb_copy_generic_ivar(VALUE clone, VALUE obj)
 
     if (!generic_iv_tbl) return;
     if (!FL_TEST(obj, FL_EXIVAR)) {
-clear:
+      clear:
         if (FL_TEST(clone, FL_EXIVAR)) {
             rb_free_generic_ivar(clone);
             FL_UNSET(clone, FL_EXIVAR);
diff --git a/version.h b/version.h
index e465348168..e40d06e3dd 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-07-20"
+#define RUBY_RELEASE_DATE "2009-07-21"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"