Merge remote-tracking branch 'origin/rm-userset'
authorDan Williams <dcbw@redhat.com>
Sun, 13 Feb 2011 04:51:12 +0000 (22:51 -0600)
committerDan Williams <dcbw@redhat.com>
Sun, 13 Feb 2011 04:51:12 +0000 (22:51 -0600)
commit6d344a43e98ad26fe6f7fec40fde06076192c718
tree2c244f19b00668a23fb4dc958a6797efcb70c233
parent5f6b68862e1d7fba08b212fb44156892463e1d0d
parente08db5cae5873b0ad68e6be7d87e5a1d9ae0cb14
Merge remote-tracking branch 'origin/rm-userset'

There; it's merged.  Yay!
cli/src/connections.c
cli/src/nmcli.c
cli/src/nmcli.h
libnm-glib/nm-client.c
libnm-util/nm-setting-ip4-config.c
man/NetworkManager.conf.5.in
po/hu.po
src/logging/nm-logging.c
src/main.c
system-settings/plugins/ifcfg-rh/reader.c
system-settings/plugins/ifcfg-rh/writer.c