rails/rails — pull request #6681 by arunagw (2012-06-08 17:11:00+00:00)
Title: Plugin gen fix

Cheery-picked from 3-2-stable

cc @rafaelfranca