first by filename and then by line number.  Closes SF patch #425821.

Also, fixes a problem with duplicate entries.