Microsoft has released a new version of the ICE photo stitching software. I haven't played with it yet, but it appears to have some content aware feature like photoshop.
I just played with this yesterday, and the auto complete feature is pretty neat. Here's an example of what it looks like when it fills in blank spots in a pano. The top image is the original and the bottom is the final result after using auto complete: