[tcpreplay/el5: 2/2] Merge branch 'master' into el5

[bojan]

commit 66f155e6e02d6eb6dcb30d659d19887934493cbf
Merge: 46b1325 235be62
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Tue Mar 25 10:33:30 2014 +1100

    Merge branch 'master' into el5

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