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

[dsommers]

commit 96d7aea967e64d6f91fcb4886f6f7e9cbbb9f343
Merge: ee130fb 91fc93d
Author: David Sommerseth <davids at redhat.com>
Date:   Mon Aug 9 15:39:54 2010 +0200

    Merge branch 'master' into f13

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