Merge branch 'mainstream'

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

Tue, 25 Feb 2014 15:42:09 +0000 (16:42 +0100)

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

Tue, 25 Feb 2014 15:42:09 +0000 (16:42 +0100)
author Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 25 Feb 2014 15:42:09 +0000 (16:42 +0100)
committer Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 25 Feb 2014 15:42:09 +0000 (16:42 +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/netdev.c
Simple merge
author	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Tue, 25 Feb 2014 15:42:09 +0000 (16:42 +0100)
committer	Giuseppe Lettieri <g.lettieri@iet.unipi.it>
	Tue, 25 Feb 2014 15:42:09 +0000 (16:42 +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/netdev.c	patch \|	diff1 \|	diff2 \|	blob \| history