Merge remote-tracking branch 'ovs-dev/master'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 31 Jul 2013 20:17:34 +0000 (22:17 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 31 Jul 2013 20:17:34 +0000 (22:17 +0200)
commitd017eeb9f9ebcb46c24a67fd301b3e36cd26a04e
treed8f6de465cfb2544bcc34996f1f61e1fae5ce9df
parentcc36576070df622d0fc7a6e26ce01027e12b5b59
parent626ace7baf31fe755bca8ac42e6bc705eca07992
Merge remote-tracking branch 'ovs-dev/master'

Conflicts:
.gitignore
.gitignore
lib/dpif-netdev.c
lib/dpif.c
lib/netdev.c