Merge branch 'e1000'

This commit is contained in:
Jeff Garzik 2005-12-13 00:01:02 -05:00
commit ff7eba15ae