Bug 1054946 - Do not assume files with same basename are identical. r=mw...

...u