merges r25300 from trunk into ruby_1_9_1.

--
* ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc.  a patch from Justin
  Collins in [ruby-core:26050].

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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 75667edfe1..e478f81d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 11 15:54:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc.  a patch from Justin
+	  Collins in [ruby-core:26050].
+
 Sat Aug 22 01:29:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index edde0d19ab..2e23f570f7 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -435,9 +435,9 @@ fgdbm_index(VALUE obj, VALUE value)
 
 /*
  * call-seq:
- *      gdbm.select { |value| block } -> array
+ *      gdbm.select { |key, value| block } -> array
  *
- * Returns a new array of all values of the database for which _block_
+ * Returns a new array of all key-value pairs of the database for which _block_
  * evaluates to true.
  */
 static VALUE
diff --git a/version.h b/version.h
index cf1bd78490..ca32ec6dac 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 363
+#define RUBY_PATCHLEVEL 364
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1