merges r24961 from trunk into ruby_1_9_1.

--
* lib/matrix.rb (Matrix#/): Fix obvious bug

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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 017023050..1349cf2d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 16 17:20:49 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb (Matrix#/): Fix obvious bug
+
 Wed Sep 16 13:39:10 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/matrix.rb (determinant): Bug fix where determinant failed on
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 6fbaacb4b..88ccbca6b 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -559,7 +559,7 @@ class Matrix
       return self * other.inverse
     else
       x, y = other.coerce(self)
-      rerurn x / y
+      return x / y
     end
   end
 
diff --git a/version.h b/version.h
index b1fcb8480..db77c82b9 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 333
+#define RUBY_PATCHLEVEL 334
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1