Bad merge of r5686 from trunk to 1.2-pre-release?

I do not closely follow the core source commits, but please bare with me. I will keep it short.

Recently, changeset#5685 [1] caught my attention as I've been waiting for some date_helper love for a VERY long time.

What bothered me is that when this changeset was merged into the 1.2-pre-release branch (at changeset#5686 [2]) a change to caching.rb crept in [3], which was not in the original patch.

I didn't notice a roll back in the revision log of caching.rb so I am assuming, no one has noticed yet?

-christos

[1] http://dev.rubyonrails.org/changeset/5685
[2] http://dev.rubyonrails.org/changeset/5686
[3] http://dev.rubyonrails.org/changeset/5686#file1

Argh, indeed. Sharp eyes.

The caching change is another pending fix.

jeremy