Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git