Merge revision 3533 from trunk.Fix sort order in funcs_by_name.csv when the same name occurs at multiple addresses.