Merge branch 'mainstream'

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

Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)

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

Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
author Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
committer Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
diff --cc Makefile.am
Simple merge
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>
	Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
committer	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Mon, 29 Oct 2012 16:27:21 +0000 (17:27 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
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