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

[bojan]

commit 87eea2b77db6aca6b241b17985452db1ea00b917
Merge: 483fc13 8e88c19
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Mon Jan 6 14:55:39 2014 +1100

    Merge branch 'master' into el6

 tcpreplay.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---