Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 16 Jan 2013 15:24:43 +0000 (16:24 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 16 Jan 2013 15:24:43 +0000 (16:24 +0100)
commit85b20fd6ee585f462e012fbcc7f966a81edab2ed
treeedcf27d29124cc510b975f5df6b45e2897713c9f
parent45b1b2d22ed8728702c61ec78ef935077b054772
parentf431bf7d78f3212d32bb3d122f783c5c796a1576
Merge branch 'mainstream'

Conflicts:
lib/dpif-netdev.c
Makefile.am
lib/automake.mk
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/netdev-provider.h
lib/netdev.c