Merge with http://www.kernel.org/pub/scm/git/git.git
authorPeter Anvin <hpa@tazenda.sc.orionmulti.com>
Thu, 29 Sep 2005 06:20:08 +0000 (23:20 -0700)
committerPeter Anvin <hpa@tazenda.sc.orionmulti.com>
Thu, 29 Sep 2005 06:20:08 +0000 (23:20 -0700)

Trivial merge