Backport rails/rails-perftest#2 to fix rake test:benchmark
Merge branch 'backport_perftest_fix' of https://github.com/senny/rails into 3-2-stable