Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:49:36 +0000 (15:49 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:49:36 +0000 (15:49 -0400)

Trivial merge