Comment 2 for bug 531304

Same difference except I used p4merge via the external diff mechanism. You will notice that it is correct.