Merge commit 'origin/master' into polkit1
authorDan Williams <dcbw@redhat.com>
Fri, 21 Aug 2009 19:12:31 +0000 (14:12 -0500)
committerDan Williams <dcbw@redhat.com>
Fri, 21 Aug 2009 19:12:31 +0000 (14:12 -0500)
commite2b13be3d91f52335fc4d1e5a09f42962b623baf
treefedb2e61bd6c0aa283299310d3ea1ec90b044626
parent650cbcc10849af93a5a308fb8d4073e7455a8140
parent09459788cdf5543dcdb296652475ef4afd59ad1e
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
configure.ac
libnm-glib/Makefile.am
libnm-glib/libnm_glib.ver
src/system-settings/Makefile.am
system-settings/plugins/ifcfg-rh/plugin.c
system-settings/plugins/ifcfg-suse/plugin.c
system-settings/plugins/keyfile/plugin.c