Merge branch 'mainstream'

Conflicts:
	lib/netdev.c

diff --cc lib/automake.mk
Simple merge

diff --cc lib/dpif-netdev.c
Simple merge

diff --cc lib/netdev-provider.h
Simple merge

diff --cc lib/netdev.c
index 5f4345a,088aea9..c70105b
--- 1/lib/netdev.c
--- 2/lib/netdev.c
+++ b/lib/netdev.c
@@@ -89,8 -109,8 +109,10 @@@ netdev_initialize(void
          netdev_register_provider(&netdev_tap_class);
          netdev_register_provider(&netdev_bsd_class);
  #endif
-       netdev_register_provider(&netdev_tunnel_class);
-       netdev_register_provider(&netdev_pltap_class);
++        netdev_register_provider(&netdev_tunnel_class);
++        netdev_register_provider(&netdev_pltap_class);
+ 
+         ovsthread_once_done(&once);
      }
  }