Merge branch 'mainstream'

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

Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)

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

Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
author Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
committer Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
diff --cc lib/automake.mk
Simple merge
diff --cc lib/dpif-netdev.c
Simple merge
diff --cc lib/dpif-provider.h
Simple merge
diff --cc lib/dpif.c
Simple merge
diff --cc lib/netdev.c
Simple merge
author	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
committer	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Sat, 24 Aug 2013 10:23:11 +0000 (12:23 +0200)
		1	2
lib/automake.mk	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dpif-netdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dpif-provider.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dpif.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/netdev.c	patch \|	diff1 \|	diff2 \|	blob \| history