Merge git://git.tuxdriver.com/git/netdev-jwl
authorJeff Garzik <jgarzik@pobox.com>
Sun, 6 Nov 2005 03:20:11 +0000 (22:20 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 6 Nov 2005 03:20:11 +0000 (22:20 -0500)

Trivial merge