Automatic merge of /spare/repo/netdev-2.6 branch tlan
authored by and committed by Jeff Garzik 21 years ago ad6a9984 38778204