merges r23447 from trunk into ruby_1_9_1.

--
* lib/rss/maker/entry.rb: fix a typo.

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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0647425a0..f9fd30f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 16 18:05:07 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/entry.rb: fix a typo.
+
 Sat May 16 18:02:57 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/maker/feed.rb, test/test_maker_atom_entry.rb,
diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb
index edaa31ec0..b35936b20 100644
--- a/lib/rss/maker/entry.rb
+++ b/lib/rss/maker/entry.rb
@@ -135,7 +135,7 @@ module RSS
               self.id = keep[:id]
               @rights = keep[:rights]
               @title = keep[:title]
-              self.updated = keep[:prev_updated]
+              self.updated = keep[:updated]
             end
 
             Guid = Feed::Items::Item::Guid
diff --git a/version.h b/version.h
index 82c4d6c39..55288ef27 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 145
+#define RUBY_PATCHLEVEL 146
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1