Automatic merge of /spare/repo/netdev-2.6 branch veth

This commit is contained in:
2005-05-25 22:11:14 -04:00 committed by Jeff Garzik
commit 8cf0d9d075