Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 14 Oct 2013 10:11:59 +0000 (12:11 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 14 Oct 2013 10:11:59 +0000 (12:11 +0200)
1  2 
lib/dpif-netdev.c
lib/dpif.c

Simple merge
diff --cc lib/dpif.c
Simple merge