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

[dsommers]

commit a0ecb8cac7f1e1be0b9b8f83ed135aea9ef6d8f7
Merge: 96d7aea 1cab7d7
Author: David Sommerseth <davids at redhat.com>
Date:   Wed Jan 19 19:13:09 2011 +0100

    Merge branch 'master' into f13

 .gitignore          |    1 +
 python-ethtool.spec |   12 +++++++++++-
 sources             |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---