Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
authorJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)

Trivial merge