Import nfdump-1.6.11
Merge branch 'vendor'

Conflicts:
	configure.in