performance enhancements related to --mbps option
Merge pull request #91 from appneta/master

Apply patch outlined in issue #38 so that pcap files can be read
Changed float to int on critical path. Avoid unnecessary calls to gettimeofday()
fix do_div() on 32-bit x86
remove unrelated modification
allow for < 0 mbp and multiplier options
reverting auto-generated files that where accidentally checked in - should we remove auto-generated files from repository?
Fix from Aaron for OSX compile issue. Works with Xcode 5.0.2.
Merge pull request #114 from appneta/Enhancement_mbps_option_accuracy

Enhancement mbps option accuracy
'n' doesn't exist anymore which causes problem when compiling with debug
fixes #114
Merge branch 'master' of github.com:synfinatic/tcpreplay

Conflicts:
	src/send_packets.c
Merge branch 'master' into Feature_netmap

Repaired conflicts:
	src/tcpreplay_api.c