Merge branch 'mainstream'

author Giuseppe Lettieri <g.lettieri@iet.unipi.it>

Thu, 10 Apr 2014 15:28:24 +0000 (17:28 +0200)

committer Giuseppe Lettieri <g.lettieri@iet.unipi.it>

Thu, 10 Apr 2014 15:28:24 +0000 (17:28 +0200)
author Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 10 Apr 2014 15:28:24 +0000 (17:28 +0200)
committer Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 10 Apr 2014 15:28:24 +0000 (17:28 +0200)
diff --cc Makefile.am
Simple merge
diff --cc lib/dpif-netdev.c
Simple merge
diff --cc lib/dpif.c
Simple merge
author	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Thu, 10 Apr 2014 15:28:24 +0000 (17:28 +0200)
committer	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Thu, 10 Apr 2014 15:28:24 +0000 (17:28 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dpif-netdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dpif.c	patch \|	diff1 \|	diff2 \|	blob \| history