merges r21145 from trunk into ruby_1_9_1.

* cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
  in [ruby-core:20921].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fa37e631ae..486e0e3f53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+Mon Dec 29 07:15:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
+	  in [ruby-core:20921].
+
 Mon Dec 29 03:43:25 2008  Koichi Sasada  <ko1@atdot.net> 
+
 	* ruby.c (process_options): set th->base_block only while
 	  it is needed.  [ruby-dev:37634] [Bug #939]
 
diff --git a/cont.c b/cont.c
index 22c7fb3720..c0db5083a8 100644
--- a/cont.c
+++ b/cont.c
@@ -611,7 +611,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *     
  *  The <code>Fiber#resume</code> method accepts an arbitary number of
  *  parameters, if it is the first call to <code>resume</code> then they
- *  will be passed as block arguments. Other wise they will be the return
+ *  will be passed as block arguments. Otherwise they will be the return
  *  value of the call to <code>Fiber.yield</code>
  *
  *  Example: