Merge branch 'upstream-fixes-jgarzik' of git://lost.foo-projects.org/~ahkok/git/netde...
authorJeff Garzik <jeff@garzik.org>
Mon, 17 Jul 2006 17:26:52 +0000 (13:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 17 Jul 2006 17:26:52 +0000 (13:26 -0400)

Trivial merge