Followup to the above comment - yep, the old version can miss conflicts.

Steps:
- make photo foo.jpg with slug foo
- make movie bar.flv with slug bar
- edit photo and change filename to bar.jpg while leaving slug foo
Result: conflict, and thumbnail of movie is overwritten by thumbnail of photo

I'll update ticket #1947 to reflect this... it's not an enhancement, but a defect.