Fix vendor require paths to prevent files being required twice

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

actionmailer/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix vendor require paths to prevent files being required twice
+
 * Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 [John Long]
 
 * Preserve underscores when unquoting message bodies #1930

actionmailer/lib/action_mailer.rb

@@ -38,7 +38,7 @@ require 'action_mailer/base'
 require 'action_mailer/helpers'
 require 'action_mailer/mail_helper'
 require 'action_mailer/quoting'
-require 'action_mailer/vendor/tmail'
+require 'tmail'
 require 'net/smtp'
 
 ActionMailer::Base.class_eval do

actionmailer/lib/action_mailer/mail_helper.rb

@@ -1,4 +1,4 @@
-require 'action_mailer/vendor/text/format'
+require 'text/format'
 
 module MailHelper#:nodoc:
   def block_format(text)
@@ -14,4 +14,4 @@ module MailHelper#:nodoc:
 
     formatted
   end
-end
+end