Merge branch 'vl/typofix' into maint

* vl/typofix:
  random typofixes (committed missing a 't', successful missing an 's')

diff --cc git-p4.py
Simple merge

diff --cc git-svn.perl
Simple merge

diff --cc t/t7600-merge.sh
Simple merge