Merge remote branch 'origin/master' into rm-userset
authorDan Williams <dcbw@redhat.com>
Tue, 19 Oct 2010 00:02:27 +0000 (19:02 -0500)
committerDan Williams <dcbw@redhat.com>
Tue, 19 Oct 2010 00:02:27 +0000 (19:02 -0500)
commit8f7aedc7e05f105eb70d5163d8a9963a3e30d30f
tree1c3b16cd1c7d5641c8ec45080b0cff32e2449c01
parentfee318abdb0950fc2b58ff02948ceba3a1a56a39
parentb368b8fea327caa972dc258933fd0e7d0f9e3381
Merge remote branch 'origin/master' into rm-userset
cli/src/connections.c
libnm-glib/Makefile.am
src/NetworkManager.conf
src/nm-device.c
src/nm-manager.c
src/nm-policy.c
src/system-settings/nm-default-wired-connection.c