Comment 2 for bug 256238

To be clear, this doesn't fix the issue when upgrading from hardy to intrepid, which is still affected; it only provides the infrastructure for handling this case in future upgrades.

I'm not sure that, this far into the intrepid support cycle, it's justified to make this intrusive of a change via SRU for a one-time upgrade bug that most users will have already dealt with.