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

[bojan]

commit 138d2197108b638ed532bcb8175bac85b73fedf9
Merge: 87eea2b 4fb91a0
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Thu Jan 30 11:57:20 2014 +1100

    Merge branch 'master' into el6

 .gitignore     |    1 +
 sources        |    2 +-
 tcpreplay.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 18359c4,83e18a3..336f4fe
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,4 @@@
 -tcpreplay-3.4.4.tar.gz
 +tcpreplay-3.4.3.tar.gz
  /tcpreplay-4.0.0beta2.tar.gz
  /tcpreplay-4.0.0.tar.gz
+ /tcpreplay-4.0.2.tar.gz