diff --git a/ChangeLog b/ChangeLog
index 903ec0ab69..916e095e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec  5 18:38:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/matrix.rb (Matrix::rank): use quo method to avoid integer
+	  division problem.  [ruby-core:09644]
+
+	* lib/matrix.rb (Matrix::rank_e): ditto.
+
 Tue Dec  5 00:59:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index c44b4c7875..cf827ebe5b 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -383,6 +383,8 @@ The variable ruby-indent-level controls the amount of indentation.
 	 (t
 	  (setq in-string (point))
 	  (goto-char end))))
+       ((looking-at "/=") 
+	(goto-char pnt))
        ((looking-at "/")
 	(cond
 	 ((and (not (eobp)) (ruby-expr-beg 'expr-re))