Merge commit 'origin/master' into polkit1

Conflicts:
	libnm-glib/Makefile.am
	src/system-settings/nm-sysconfig-settings.c
	system-settings/plugins/ifcfg-rh/plugin.c

diff --cc configure.ac
Simple merge

diff --cc libnm-glib/Makefile.am
index 2b7dd01,2b39b64..0a6993a
--- 1/libnm-glib/Makefile.am
--- 2/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@@ -49,15 -51,11 +50,16 @@@ libnminclude_HEADERS = 
        nm-vpn-plugin-ui-interface.h \
        nm-types.h \
        nm-active-connection.h \
 -      nm-dbus-connection.h \
 -      nm-dbus-settings.h \
 -      nm-dbus-settings-system.h \
        nm-dhcp4-config.h \
 -      nm-ip6-config.h
++      nm-ip6-config.h \
 +      nm-remote-connection.h \
 +      nm-settings-interface.h \
 +      nm-settings-system-interface.h \
 +      nm-remote-settings.h \
 +      nm-remote-settings-system.h \
 +      nm-settings-connection-interface.h \
 +      nm-exported-connection.h \
 +      nm-settings-service.h
  
  libnm_glib_la_SOURCES = \
        libnm_glib.c \
@@@ -82,16 -81,11 +84,17 @@@
        nm-object-cache.c \
        nm-object-cache.h \
        nm-active-connection.c \
 -      nm-dbus-connection.c \
 -      nm-dbus-settings.c \
 -      nm-dbus-settings-system.c \
        nm-dhcp4-config.c \
 -      nm-ip6-config.c
++      nm-ip6-config.c \
 +      nm-remote-connection.c \
 +      nm-remote-connection-private.h \
 +      nm-settings-interface.c \
 +      nm-settings-system-interface.c \
 +      nm-remote-settings.c \
 +      nm-remote-settings-system.c \
 +      nm-settings-connection-interface.c \
 +      nm-exported-connection.c \
 +      nm-settings-service.c
  
  libnm_glib_la_LIBADD = \
        $(top_builddir)/libnm-util/libnm-util.la \

diff --cc libnm-glib/libnm_glib.ver
Simple merge

diff --cc src/system-settings/Makefile.am
Simple merge

diff --cc system-settings/plugins/ifcfg-rh/plugin.c
Simple merge

diff --cc system-settings/plugins/ifcfg-suse/plugin.c
Simple merge

diff --cc system-settings/plugins/keyfile/plugin.c
Simple merge