Merge branch 'ovs-dev', remote branch 'origin' into bsd-port

diff --cc acinclude.m4
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/automake.mk
Simple merge

diff --cc lib/netdev-provider.h
Simple merge

diff --cc lib/netdev.c
Simple merge

diff --cc lib/vlandev.c
Simple merge

diff --cc ofproto/ofproto-dpif-sflow.c
Simple merge