#159 Encapsulated the not so there is no confusion
#160 Added netmap delay option
#160 tab to spaces
#160 tab to spaces
#160 Updated changelog
Merge pull request #162 from appneta/Bug_#160_netmap_if_delay

Bug #160 netmap if delay
Merge branch 'master' of github.com:appneta/tcpreplay into Bug_#159_compile_warning
#159 added to changelog
Merge pull request #161 from appneta/Bug_#159_compile_warning

#159 Encapsulated the not so there is no confusion
Merged master