Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
authorJeff Garzik <jgarzik@localhost.localdomain>
Thu, 26 Oct 2006 04:11:28 +0000 (21:11 -0700)
committerJeff Garzik <jgarzik@localhost.localdomain>
Thu, 26 Oct 2006 04:11:28 +0000 (21:11 -0700)

Trivial merge