[StGIT PATCH 0/6] David's conflict series using my subprocess stuff

This is David's conflict series, rebased on top of my subprocess calling series. There was one place where it used to have to call popen2.Popen3 directly, since none of our existing ten subprocess functions could do that particular job. But the new subprocess machinery can. (This was the original motivation for that refactoring, by the way.)