1.6.9
Merge remote-tracking branch 'upstream/master' into local

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/requests
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	bin/nfdump_inline.c
	bin/nflowcache.c
	bin/nfstat.c
	configure
1.6.10
Merge branch 'master' into local

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	bin/Makefile.in
	config.h.in
	configure
Merge branch 'local' into nfdist