Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/ur_PK: pgadmin3.mo (r1.6 -> r1.7)