Merge "Rebase: adapt patches after ovs/dpdk fix"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 5 Aug 2016 10:15:31 +0000 (10:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 5 Aug 2016 10:15:32 +0000 (10:15 +0000)

Trivial merge