merges r25334 from trunk into ruby_1_9_1.

--
* string.c (rb_check_string_type): rdoc fix [ruby-core:26084]

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

2 files changed, 2 insertions, 2 deletions

diff --git a/string.c b/string.c
index f5945985c9..33f1646372 100644
--- a/string.c
+++ b/string.c
@@ -1283,7 +1283,7 @@ rb_check_string_type(VALUE str)
  *     String.try_convert(obj) -> string or nil
  *
  *  Try to convert <i>obj</i> into a String, using to_str method.
- *  Returns converted regexp or nil if <i>obj</i> cannot be converted
+ *  Returns converted string or nil if <i>obj</i> cannot be converted
  *  for any reason.
  *
  *     String.try_convert("str")     # => str
diff --git a/version.h b/version.h
index 035f4e4a09..8178e55943 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 390
+#define RUBY_PATCHLEVEL 391
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1