Merge branch 'ovs-dev' of /usr/local/git/openvswitch into ovs-dev