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
..
ifcfg-rh	Merge commit 'origin/master' into polkit1	2009-08-21 14:12:31 -05:00
ifcfg-suse	Merge commit 'origin/master' into polkit1	2009-08-21 14:12:31 -05:00
ifupdown	Merge commit 'origin/master' into polkit1	2009-08-21 14:12:31 -05:00
keyfile	Merge commit 'origin/master' into polkit1	2009-08-21 14:12:31 -05:00
Makefile.am	2008-11-25 Dan Williams <dcbw@redhat.com>	2008-11-25 22:42:21 +00:00