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

[dsommers]

commit 6fda4f7a26d733975e73ada43bd88da747817bf6
Merge: 4d242d5 91fc93d
Author: David Sommerseth <davids at redhat.com>
Date:   Mon Aug 9 15:31:02 2010 +0200

    Merge branch 'master' into f12

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