Fixup fromcvs/togit conversion
Fixup fromcvs/togit conversion
Merge remote-tracking branch 'pkgsrc/master'