Dan Williams e2b13be3d9 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

2009-08-21 14:12:31 -05:00

..

plugins

Merge commit 'origin/master' into polkit1

2009-08-21 14:12:31 -05:00

Makefile.am

everything: use libgudev instead of HAL; merge NM and nm-system-settings

2009-06-11 00:39:12 -04:00