Merge with git+ssh://master.kernel.org/pub/scm/git/git.git
authorH. Peter Anvin <hpa@smyrno.hos.anvin.org>
Tue, 27 Sep 2005 15:50:08 +0000 (08:50 -0700)
committerH. Peter Anvin <hpa@smyrno.hos.anvin.org>
Tue, 27 Sep 2005 15:50:08 +0000 (08:50 -0700)

Trivial merge