After the last year, nothing Canon may do will surprise me.
Still, I'm having a hard time buying the idea that Canon will merge the 60D and 7D. They fit two very different niche markets and I can't see them conceding either to Nikon and others. Especially since the "prosumer" market is one of the most lucrative.
The real problem for the 60D is that it is too closely sized and spec'd to the Rebels, not to the 7D. Lots of room to move the 7D up in price with better sensor, better autofocus, better weathersealing and possibly even an integrated grip.
I have no interest in a full-frame body. Like I've said before, I'd rather have a top end mid-size car than a stripped-down full-sized version. If I'm honest with myself, I don't really need anything that the 7D doesn't already give me. I could be lured by better sensor, autofocus and weathersealing, but if Canon doesn't deliver this time around, I'll just buy a second 7D body from the refurbished store and wait them out. After all, if they are serious about new bodies every 6-8 weeks, I'm sure they'll come around soon enough.