[python-ethtool/f19: 8/8] Merge branch 'master' into f19

[dsommers]

commit 62a2ad1ca9fc756e3088c7a64ad403b7711389dc
Merge: 0e25400 5a45196
Author: David Sommerseth <davids at redhat.com>
Date:   Thu May 8 16:08:49 2014 +0200

    Merge branch 'master' into f19
    
    Signed-off-by: David Sommerseth <davids at redhat.com>

 .gitignore          |    2 ++
 python-ethtool.spec |   28 ++++++++++++++++++++++++++--
 sources             |    2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
---