[python-ethtool/f13/master: 4/4] Merge branch 'master' into f13

[dsommers]

commit ee130fb7dec57ae98f8bc0f3fcbf8b60a92e0b07
Merge: c86ac77 cdab08c
Author: David Sommerseth <davids at redhat.com>
Date:   Wed Aug 4 11:17:45 2010 +0200

    Merge branch 'master' into f13
    
    Updates to v0.4

 .gitignore          |    1 +
 python-ethtool.spec |   18 ++++++++++++------
 sources             |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---