sandofsky's patch in #7337 was recently applied but was rolled back
and set to unverified due to failing tests. I submitted a patch that
fixes the failing test (without changing sandofsky's fix). If anyone
has the time to help verify, please do:
http://dev.rubyonrails.org/ticket/7337
Thanks
