2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d874f7b4cd..547d3a7c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  7 20:08:12 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* error.c (exc_inspect): Fix typo. patch from Trent Ogren
+	  via https://github.com/ruby/ruby/pull/90
+
 Tue Feb  7 19:37:35 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* st.c: refactor packed entries using structs.
diff --git a/error.c b/error.c
index 03e22bfa3a..f83cf3d5cf 100644
--- a/error.c
+++ b/error.c
@@ -613,7 +613,7 @@ exc_message(VALUE exc)
  * call-seq:
  *   exception.inspect   -> string
  *
- * Return this exception's class name an message
+ * Return this exception's class name and message
  */
 
 static VALUE