Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
authorJ. Bruce Fields <bfields@citi.umich.edu>
Mon, 15 Jan 2007 00:27:28 +0000 (19:27 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Mon, 15 Jan 2007 00:27:28 +0000 (19:27 -0500)

Trivial merge