Merge branch 'master' into forward-port
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 30 Aug 2012 14:35:26 +0000 (16:35 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 30 Aug 2012 14:35:26 +0000 (16:35 +0200)
commit1e3f34c7693bcabae8e443ac1b246680ef9b60e2
tree1789d5b2631742dca92e53c2ea769eda27278b46
parent079b5942276a04b2b18f1ec5bd2e07170e3ab9bd
parentffa2665decbf47eb2a1ce642944144061454940c
Merge branch 'master' into forward-port

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