Merge with master.kernel.org:/pub/scm/git/git.git
authorPeter Anvin <hpa@tazenda.sc.orionmulti.com>
Mon, 3 Oct 2005 23:42:45 +0000 (16:42 -0700)
committerPeter Anvin <hpa@tazenda.sc.orionmulti.com>
Mon, 3 Oct 2005 23:42:45 +0000 (16:42 -0700)

Trivial merge