Merge commit 'origin/master' into iscsi

diff --cc src/nm-device-ethernet.c
Simple merge

diff --cc src/nm-device-interface.c
Simple merge

diff --cc src/nm-device-interface.h
Simple merge

diff --cc src/nm-device.c
index 56634ef,18e6a9f..53e18f2
--- 1/src/nm-device.c
--- 2/src/nm-device.c
+++ b/src/nm-device.c
@@@ -121,10 -130,9 +130,10 @@@ static gboolean nm_device_activate (NMD
                                      NMActRequest *req,
                                      GError **error);
  static void nm_device_deactivate (NMDeviceInterface *device, NMDeviceStateReason reason);
 -static gboolean nm_device_spec_match_list (NMDeviceInterface *device, const GSList *specs);
 +static gboolean spec_match_list (NMDeviceInterface *device, const GSList *specs);
 +static NMConnection *connection_match_config (NMDeviceInterface *device, const GSList *connections);
  
- static void nm_device_activate_schedule_stage5_ip_config_commit (NMDevice *self);
+ static void nm_device_activate_schedule_stage5_ip_config_commit (NMDevice *self, int family);
  
  static void nm_device_take_down (NMDevice *dev, gboolean wait, NMDeviceStateReason reason);
  
@@@ -2251,10 -2570,10 +2592,11 @@@ dispose (GObject *object
  
        clear_act_request (self);
  
-       activation_source_clear (self, TRUE);
+       activation_source_clear (self, TRUE, AF_INET);
+       activation_source_clear (self, TRUE, AF_INET6);
  
 -      nm_device_set_use_dhcp (self, FALSE);
 +      if (!take_down)
 +              nm_device_set_use_dhcp (self, FALSE);
  
        if (priv->dnsmasq_manager) {
                if (priv->dnsmasq_state_id) {

diff --cc src/nm-device.h
Simple merge

diff --cc src/nm-manager.c
Simple merge