rails/rails — pull request #9942 by fredwu (2013-03-27 00:31:35+00:00)
Title: Test fix for 74e59ea

This fixes the backport PR #9899 causing test failures on 1.8.7.