Bug 946502 - Fix bustage from KDiff3 bungling the merge. a=bustage