[tcpreplay/el6: 3/3] Merge branch 'master' into el6

[bojan]

commit 8219f58d41e3614704f1361739ff1522ca328088
Merge: 138d219 17bb6a3
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed Feb 5 09:46:16 2014 +1100

    Merge branch 'master' into el6

 .gitignore     |    1 +
 sources        |    2 +-
 tcpreplay.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---