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

[bojan]

commit 2ff7c11ff47945057844bce646beb3adfd155bcd
Merge: 6980261 8e88c19
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Mon Jan 6 14:56:46 2014 +1100

    Merge branch 'master' into el5

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