diff --git a/ChangeLog b/ChangeLog
index 2bb2f738cf..b57d26f0e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Dec 17 20:06:32 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/date.rb (once): Use Object#object_id instead of Symbol#to_i;
+	  backported from trunk besides the caching.
+
+	* lib/erb.rb (ERB::Compiler::TrimScanner#scan): Use
+	  String#each_line instead of String#each.
+
+	* rubytest.rb: Ditto.
+
 Wed Dec 17 19:53:48 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* object.c (rb_any_to_a): Always use "... is deprecated" for a
diff --git a/lib/date.rb b/lib/date.rb
index 19991d60b4..4323c6f2f6 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1005,10 +1005,10 @@ class Date
     def once(*ids) # :nodoc:
       for id in ids
 	module_eval <<-"end;"
-	  alias_method :__#{id.to_i}__, :#{id.to_s}
-	  private :__#{id.to_i}__
+	  alias_method :__#{id.object_id}__, :#{id.to_s}
+	  private :__#{id.object_id}__
 	  def #{id.to_s}(*args, &block)
-	    (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
+	    (@__#{id.object_id}__ ||= [__#{id.object_id}__(*args, &block)])[0]
 	  end
 	end;
       end
diff --git a/lib/erb.rb b/lib/erb.rb
index f1661f98cb..1f6e9781c3 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -304,7 +304,7 @@ class ERB
       def scan(&block)
 	@stag = nil
 	if @percent
-	  @src.each do |line|
+	  @src.each_line do |line|
 	    percent_line(line, &block)
 	  end
 	else
diff --git a/rubytest.rb b/rubytest.rb
index 8ae637c00e..b96724ec65 100755
--- a/rubytest.rb
+++ b/rubytest.rb
@@ -37,7 +37,7 @@ $stderr.reopen($stdout)
 error = ''
 
 srcdir = File.dirname(__FILE__)
-`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line|
+`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line|
   if line =~ /^end of test/
     print "test succeeded\n"
     exit 0