Merge commit 'origin/master' into polkit1
authorDan Williams <dcbw@redhat.com>
Mon, 10 Aug 2009 21:27:16 +0000 (16:27 -0500)
committerDan Williams <dcbw@redhat.com>
Mon, 10 Aug 2009 21:27:16 +0000 (16:27 -0500)
commitf64354d0cc458baf4f4862dcc1a9cc87e9bf08c3
tree3c8135dc153f3314fab0a288e579a4efeaf7dd67
parent0d69dfe39ef61b42b2024c7fbd8bbad9e9c6d164
parent38f732a721955ffc66bb5c679c8302c499d20a62
Merge commit 'origin/master' into polkit1

Conflicts:
system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
configure.ac
src/nm-manager.c
system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c