Merge commit 'origin/master' into polkit1

Conflicts:
	system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c

diff --cc configure.ac
Simple merge

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

diff --cc system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index aafc41e,5561df3..68f9640
--- 1/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
--- 2/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@@ -112,8 -104,8 +112,8 @@@ nm_ifcfg_connection_new (const char *fi
  
        g_return_val_if_fail (filename != NULL, NULL);
  
-       tmp = connection_from_file (filename, NULL, NULL, &unmanaged, &keyfile, error, ignore_error);
 -      wrapped = connection_from_file (filename, NULL, NULL, NULL, &unmanaged, &keyfile, error, ignore_error);
 -      if (!wrapped)
++      tmp = connection_from_file (filename, NULL, NULL, NULL, &unmanaged, &keyfile, error, ignore_error);
 +      if (!tmp)
                return NULL;
  
        object = (GObject *) g_object_new (NM_TYPE_IFCFG_CONNECTION,