rails/rails — pull request #5105 by lawso017 (2012-02-21 00:55:55+00:00)
Title: 3 2 stable backport of PR 5096 from Master

Please ignore the .gitignore commit... git cherry-pick FTW...