Log Message:-----------Ignore files that don't match ??_??
Modified Files:-------------- pgadmin3: stringmerge (r1.6 -> r1.7)