rails/rails — pull request #6587 by amatsuda (2012-06-01 14:19:30+00:00)
Title: Backporting #6586 patch to 3-2-stable

Backporting #6586 patch to 3-2-stable, as I found a blank line in a `rails generate`d contoller on my new Rails 3.2.5 app.