* lib/time.rb: require 'date'.

	* ext/date/lib/date/format.rb: removed require line.


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

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 91d1f9b3b4..93c0268176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 25 03:31:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/time.rb: require 'date'.
+	* ext/date/lib/date/format.rb: removed require line.
+
 Mon Apr 25 03:08:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* ext/date/lib/date/format.rb: require 'date'.
diff --git a/ext/date/lib/date/format.rb b/ext/date/lib/date/format.rb
index 6807b40d8e..d551d2d4ce 100644
--- a/ext/date/lib/date/format.rb
+++ b/ext/date/lib/date/format.rb
@@ -1,7 +1,5 @@
 # format.rb: Written by Tadayoshi Funaba 1999-2011
 
-require 'date'
-
 class Date
 
   module Format # :nodoc:
diff --git a/lib/time.rb b/lib/time.rb
index 796dfd6361..7186531387 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -40,7 +40,7 @@
 # The above statements are not valid now.
 #
 
-require 'date/format'
+require 'date'
 
 #
 # Implements the extensions to the Time class that are described in the