Minor tweaks

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activesupport/lib/core_ext/string/inflections.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + '/../../inflector'
 module ActiveSupport
   module CoreExtensions
     module String

activesupport/lib/dependencies.rb

@@ -30,8 +30,10 @@ module Dependencies
     clear
     
     old_loaded.each do |file_name| 
+      next if loaded.include?(file_name)
+
       begin
-        silence_warnings { load("#{file_name}.rb") } unless loaded.include?(file_name)
+        silence_warnings { load("#{file_name}.rb") }
         loaded << file_name
       rescue LoadError
         # The association didn't reside in its own file, so we assume it was required by other means