[python-ethtool/origin/f12/master: 5/5] Merge branch 'master' into f12

[dsommers]

commit 4d242d5f6936392d5b60325bc88124a6be68b9f3
Merge: acce16e cdab08c
Author: David Sommerseth <davids at redhat.com>
Date:   Wed Aug 4 11:09:00 2010 +0200

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

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