rails/rails — pull request #6038 by arunagw (2012-04-28 18:40:27+00:00)
Title: Warning removed 3 2 stable

Cheery-picked from master f98d929e675fb68a4f031ff09ccc8b1dfe00454e