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

[dsommers]

commit 506379460a512a86f5dcaca1a0db9e1c485ea77d
Merge: a0ecb8c 3f347fe
Author: David Sommerseth <davids at redhat.com>
Date:   Tue Apr 12 16:45:15 2011 +0200

    Merge branch 'master' into f13

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