Dan Williams f64354d0cc Merge commit 'origin/master' into polkit1 ... Conflicts: system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c		2009-08-10 16:27:16 -05:00
..
plugins	Merge commit 'origin/master' into polkit1	2009-08-10 16:27:16 -05:00
Makefile.am	everything: use libgudev instead of HAL; merge NM and nm-system-settings	2009-06-11 00:39:12 -04:00