Merge remote branch 'origin/master' into gsoc
authorDan Williams <dcbw@redhat.com>
Thu, 26 Aug 2010 14:18:37 +0000 (09:18 -0500)
committerDan Williams <dcbw@redhat.com>
Thu, 26 Aug 2010 14:18:37 +0000 (09:18 -0500)
commit022d8e665ceffe2a167e0029619c2bd08ceb912e
tree4b531642930b2c59e8c567fe4e3d1d168f5f2ed1
parent6ebc201636769cbdecffceab613d3f91f426be09
parentf917852de3f4676f259edd2f272b561c9068435b
Merge remote branch 'origin/master' into gsoc
15 files changed:
libnm-glib/nm-client.c
libnm-glib/nm-remote-settings.c
po/POTFILES.in
src/nm-device.c
src/nm-manager-auth.c
src/nm-manager-auth.h
src/nm-manager.c
src/nm-policy.c
src/system-settings/nm-polkit-helpers.h
src/system-settings/nm-session-manager.c
src/system-settings/nm-sysconfig-connection.c
src/system-settings/nm-sysconfig-settings.c
src/vpn-manager/nm-vpn-connection.c
system-settings/plugins/ifcfg-rh/plugin.c
system-settings/plugins/ifupdown/plugin.c