Merge pull request #10646 from kennyj/fix_am_20130517

Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md